diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 14:33:47 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2012-10-25 14:33:47 +0000 |
commit | dca633f1c8441e0c3f47662c1dc51e29f0c0fa94 (patch) | |
tree | 27e003a7e97a51f3e46207657be07de2c205e910 /target/linux/brcm47xx/patches-3.3/501-bcma-add-gpio-driver.patch | |
parent | f911fb32feca42396c09ebf0042b99e207cd7c48 (diff) | |
download | upstream-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.tar.gz upstream-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.tar.bz2 upstream-dca633f1c8441e0c3f47662c1dc51e29f0c0fa94.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
SVN-Revision: 33920
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.patch | 4 |
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); |