From e676003d8704a75d5ee3b58ccf820e827f836de9 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 10 Jan 2013 14:05:18 +0000 Subject: kernel: update bcma and ssb to master-2013-01-09 from wireless-testing git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35080 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.6/235-bcma-dont-expose-mips-irq.patch | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch') diff --git a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch index 5df8636058..b7cf0bced4 100644 --- a/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch +++ b/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch @@ -10,7 +10,7 @@ #endif /* LINUX_BCMA_DRIVER_MIPS_H_ */ --- a/drivers/bcma/driver_chipcommon.c +++ b/drivers/bcma/driver_chipcommon.c -@@ -258,7 +258,7 @@ void bcma_chipco_serial_init(struct bcma +@@ -329,7 +329,7 @@ void bcma_chipco_serial_init(struct bcma return; } @@ -64,17 +64,6 @@ + return bcma_core_irq(pc_host->pdev->core); } EXPORT_SYMBOL(bcma_core_pci_pcibios_map_irq); ---- a/arch/mips/bcm47xx/gpio.c -+++ b/arch/mips/bcm47xx/gpio.c -@@ -94,7 +94,7 @@ int gpio_to_irq(unsigned gpio) - #endif - #ifdef CONFIG_BCM47XX_BCMA - case BCM47XX_BUS_TYPE_BCMA: -- return bcma_core_mips_irq(bcm47xx_bus.bcma.bus.drv_cc.core) + 2; -+ return bcma_core_irq(bcm47xx_bus.bcma.bus.drv_cc.core); - #endif - } - return -EINVAL; --- a/arch/mips/bcm47xx/serial.c +++ b/arch/mips/bcm47xx/serial.c @@ -62,7 +62,7 @@ static int __init uart8250_init_bcma(voi -- cgit v1.2.3