aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-10-25 14:33:47 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-10-25 14:33:47 +0000
commit183c8129ef4ca3a21994a111118fa12fd9e782d2 (patch)
treebbbcac3fb6d358126698f3764c562345b210dc9c /target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch
parent1e4b9a79ca1101e33c630e1d0b53611e01baba38 (diff)
downloadupstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.tar.gz
upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.tar.bz2
upstream-183c8129ef4ca3a21994a111118fa12fd9e782d2.zip
kernel: update bcma and ssb to master-2012-10-18 from wireless-testing
* update the flash driver for bcm47xx to use the stubs already in bcma * do some misc enhancements to the flash drivers for bcm47xx git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33920 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch')
-rw-r--r--target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch b/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch
index 951c6d40e9..b8f72a12c6 100644
--- a/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch
+++ b/target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch
@@ -99,7 +99,7 @@
void bcma_chipco_serial_init(struct bcma_drv_cc *cc)
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
-@@ -495,6 +495,9 @@ struct bcma_drv_cc {
+@@ -551,6 +551,9 @@ struct bcma_drv_cc {
int nr_serial_ports;
struct bcma_serial_port serial_ports[4];
#endif /* CONFIG_BCMA_DRIVER_MIPS */
@@ -109,7 +109,7 @@
};
/* Register access */
-@@ -525,13 +528,22 @@ void bcma_chipco_irq_mask(struct bcma_dr
+@@ -581,13 +584,22 @@ void bcma_chipco_irq_mask(struct bcma_dr
u32 bcma_chipco_irq_status(struct bcma_drv_cc *cc, u32 mask);