From bdc39c62ca913f3444a0f3fb7a8600810ecb6866 Mon Sep 17 00:00:00 2001 From: hauke Date: Mon, 2 Jul 2012 23:12:58 +0000 Subject: kernel: ssb/bcma: update to version from wireless-testing tag master-2012-07-02 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32580 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch') diff --git a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch index 00f3311a0..ed3392b88 100644 --- a/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch +++ b/target/linux/brcm47xx/patches-3.3/030-bcm47xx-bcma-nandflash.patch @@ -971,7 +971,7 @@ +MODULE_DESCRIPTION("BCM47XX NAND flash driver"); --- a/include/linux/bcma/bcma_driver_chipcommon.h +++ b/include/linux/bcma/bcma_driver_chipcommon.h -@@ -400,6 +400,7 @@ struct bcma_chipcommon_pmu { +@@ -422,6 +422,7 @@ struct bcma_chipcommon_pmu { enum bcma_flash_type { BCMA_PFLASH, BCMA_SFLASH, @@ -979,7 +979,7 @@ }; struct bcma_pflash { -@@ -416,6 +417,14 @@ struct bcma_sflash { +@@ -438,6 +439,14 @@ struct bcma_sflash { }; #endif /* CONFIG_BCMA_SFLASH */ @@ -994,7 +994,7 @@ struct bcma_serial_port { void *regs; unsigned long clockspeed; -@@ -441,6 +450,9 @@ struct bcma_drv_cc { +@@ -463,6 +472,9 @@ struct bcma_drv_cc { #ifdef CONFIG_BCMA_SFLASH struct bcma_sflash sflash; #endif /* CONFIG_BCMA_SFLASH */ @@ -1004,7 +1004,7 @@ }; int nr_serial_ports; -@@ -505,4 +517,13 @@ int bcma_sflash_write(struct bcma_drv_cc +@@ -528,4 +540,13 @@ int bcma_sflash_write(struct bcma_drv_cc int bcma_sflash_erase(struct bcma_drv_cc *cc, u32 offset); #endif /* CONFIG_BCMA_SFLASH */ -- cgit v1.2.3