aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-04-19 12:39:40 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-04-19 12:39:40 +0000
commitf58dcb59c6621a9c587e3ce9705c88de6239b47e (patch)
tree21d994e1e42ab31d89c6977a3bb2027a09129ba1 /target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch
parentf03960723a9af29b7e6468212f336b28083050b5 (diff)
downloadupstream-f58dcb59c6621a9c587e3ce9705c88de6239b47e.tar.gz
upstream-f58dcb59c6621a9c587e3ce9705c88de6239b47e.tar.bz2
upstream-f58dcb59c6621a9c587e3ce9705c88de6239b47e.zip
kernel: backport SSB/BCMA changes in preparation for a compat-wireless update
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 36367
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.6/235-bcma-dont-expose-mips-irq.patch4
1 files changed, 2 insertions, 2 deletions
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 d06eb8f0a6..073ac42051 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
-@@ -329,7 +329,7 @@ void bcma_chipco_serial_init(struct bcma
+@@ -332,7 +332,7 @@ void bcma_chipco_serial_init(struct bcma
return;
}
@@ -65,7 +65,7 @@
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
return 0;
-@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const
+@@ -596,6 +596,6 @@ int bcma_core_pci_pcibios_map_irq(const
pc_host = container_of(dev->bus->ops, struct bcma_drv_pci_host,
pci_ops);