diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-08-23 17:31:04 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-08-23 17:31:04 +0000 |
| commit | 043edd80744308e9d1b8c0bf2213bd7a71770cb1 (patch) | |
| tree | 8b1ccfd0ecdc4680df553aae16f6f937193a5b4c /target/linux/generic/patches-3.10/025-bcma_backport.patch | |
| parent | 6f232cba6241c248000fbca5e7261c1a79accbb4 (diff) | |
| download | master-31e0f0ae-043edd80744308e9d1b8c0bf2213bd7a71770cb1.tar.gz master-31e0f0ae-043edd80744308e9d1b8c0bf2213bd7a71770cb1.tar.bz2 master-31e0f0ae-043edd80744308e9d1b8c0bf2213bd7a71770cb1.zip | |
kernel: update 3.10 to 3.10.9
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37832
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 b8a8692dc7..a4ae800b16 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; |