From 773f441e1b78eff844414ca9a4d491917e6c0c8c Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 4 Jan 2013 00:51:24 +0100 Subject: [PATCH] --- yaml --- r: 351839 b: refs/heads/master c: 8f9dc85348ac37ff3b6b031d22e93a5b59d81f83 h: refs/heads/master i: 351837: 1ce2c525e70ed8c027860382a885bc4281f6ebcc 351835: aa6ad94bc6bd6c73600632f9706e2e25ec7dfd37 351831: 00650a8154c693db28c89eacdcfeda54dabc8095 351823: 4ca83aaf2d96706b1a25bc2e0efe75ba2400525a 351807: 6c6f5a9de6756aafeb3a8b17f2cf83d68537aa2a v: v3 --- [refs] | 2 +- trunk/drivers/bcma/driver_mips.c | 2 -- trunk/include/linux/bcma/bcma_driver_mips.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 68e18ead4473..82d7b72af78e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db5230d1b3c5f7c62564de2ef07ea1c633548959 +refs/heads/master: 8f9dc85348ac37ff3b6b031d22e93a5b59d81f83 diff --git a/trunk/drivers/bcma/driver_mips.c b/trunk/drivers/bcma/driver_mips.c index 69815079a6dd..c6d7be33b972 100644 --- a/trunk/drivers/bcma/driver_mips.c +++ b/trunk/drivers/bcma/driver_mips.c @@ -263,8 +263,6 @@ void bcma_core_mips_init(struct bcma_drv_mips *mcore) bcma_core_mips_early_init(mcore); - mcore->assigned_irqs = 1; - switch (bus->chipinfo.id) { case BCMA_CHIP_ID_BCM4716: case BCMA_CHIP_ID_BCM4748: diff --git a/trunk/include/linux/bcma/bcma_driver_mips.h b/trunk/include/linux/bcma/bcma_driver_mips.h index 0baf8a56b794..6495579e3f35 100644 --- a/trunk/include/linux/bcma/bcma_driver_mips.h +++ b/trunk/include/linux/bcma/bcma_driver_mips.h @@ -36,7 +36,6 @@ struct bcma_drv_mips { struct bcma_device *core; u8 setup_done:1; u8 early_setup_done:1; - unsigned int assigned_irqs; }; #ifdef CONFIG_BCMA_DRIVER_MIPS