diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-10 14:05:18 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-01-10 14:05:18 +0000 |
| commit | 885eea184225e2d190f7aa8742ac806034caa9fc (patch) | |
| tree | d60d951609d8e3a315c92b06a0670dc814525594 /target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch | |
| parent | a2950fabd4c84c867bf303e2e92bf99c2eb8b87a (diff) | |
| download | upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.gz upstream-885eea184225e2d190f7aa8742ac806034caa9fc.tar.bz2 upstream-885eea184225e2d190f7aa8742ac806034caa9fc.zip | |
kernel: update bcma and ssb to master-2013-01-09 from wireless-testing
SVN-Revision: 35080
Diffstat (limited to 'target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch b/target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch index cacb903430..f21608b0b8 100644 --- a/target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch +++ b/target/linux/brcm47xx/patches-3.6/072-bcma-register-parallel-flash-device.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h -@@ -45,6 +45,7 @@ int bcma_sprom_get(struct bcma_bus *bus) +@@ -47,6 +47,7 @@ int bcma_sprom_get(struct bcma_bus *bus) /* driver_chipcommon.c */ #ifdef CONFIG_BCMA_DRIVER_MIPS void bcma_chipco_serial_init(struct bcma_drv_cc *cc); @@ -18,7 +18,7 @@ /* The 47162a0 hangs when reading MIPS DMP registers registers */ static inline bool bcma_core_mips_bcm47162a0_quirk(struct bcma_device *dev) -@@ -178,6 +179,19 @@ u32 bcma_cpu_clock(struct bcma_drv_mips +@@ -201,6 +202,19 @@ u32 bcma_cpu_clock(struct bcma_drv_mips } EXPORT_SYMBOL(bcma_cpu_clock); @@ -38,7 +38,7 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore) { struct bcma_bus *bus = mcore->core->bus; -@@ -200,6 +214,9 @@ static void bcma_core_mips_flash_detect( +@@ -223,6 +237,9 @@ static void bcma_core_mips_flash_detect( cc->pflash.buswidth = 1; else cc->pflash.buswidth = 2; |