diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-07-29 22:42:22 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-07-29 22:42:22 +0000 |
commit | 8f047925312e05a622919181a045cf8ae3ed5616 (patch) | |
tree | 942454f253f4013c4e510d5acd63d109289ddae6 /target/linux/generic/patches-3.10/025-bcma_backport.patch | |
parent | 36e6d4ca53495970956c697c8549d16ceb998242 (diff) | |
download | upstream-8f047925312e05a622919181a045cf8ae3ed5616.tar.gz upstream-8f047925312e05a622919181a045cf8ae3ed5616.tar.bz2 upstream-8f047925312e05a622919181a045cf8ae3ed5616.zip |
kernel: update to linux 3.10.4, refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 37617
Diffstat (limited to 'target/linux/generic/patches-3.10/025-bcma_backport.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/025-bcma_backport.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/025-bcma_backport.patch b/target/linux/generic/patches-3.10/025-bcma_backport.patch index a4ae800b16..b8a8692dc7 100644 --- a/target/linux/generic/patches-3.10/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.10/025-bcma_backport.patch @@ -66,7 +66,7 @@ } EXPORT_SYMBOL_GPL(bcma_core_disable); -@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device +@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device bcma_aread32(core, BCMA_IOCTL); bcma_awrite32(core, BCMA_RESET_CTL, 0); @@ -269,7 +269,7 @@ { "AT45DB011", 0xc, 256, 512, }, { "AT45DB021", 0x14, 256, 1024, }, { "AT45DB041", 0x1c, 256, 2048, }, -@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc +@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc { struct bcma_bus *bus = cc->core->bus; struct bcma_sflash *sflash = &cc->sflash; |