aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-06-29 09:07:54 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-06-29 09:07:54 +0000
commitc75d54bf3f77bbf850817b0c85d8b4f0e783691f (patch)
treeaa91b279aaa37e72a95b00dc3bd8a7b6fda629c8
parent4a759750deb3bef86d17d471d5b863d0008f1e08 (diff)
downloadupstream-c75d54bf3f77bbf850817b0c85d8b4f0e783691f.tar.gz
upstream-c75d54bf3f77bbf850817b0c85d8b4f0e783691f.tar.bz2
upstream-c75d54bf3f77bbf850817b0c85d8b4f0e783691f.zip
[brcm63xx] fix watchdog and rng drivers section mismatch (#11767)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32522 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch2
-rw-r--r--target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch20
-rw-r--r--target/linux/brcm63xx/patches-3.3/800-wl_exports.patch2
3 files changed, 22 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch b/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch
index a6a2bc0cd5..8e14bd7dcc 100644
--- a/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch
+++ b/target/linux/brcm63xx/patches-3.3/105-hw_random-add-Broadcom-BCM63xx-RNG-driver.patch
@@ -110,7 +110,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
+ return 4;
+}
+
-+static int __init bcm63xx_trng_probe(struct platform_device *pdev)
++static int __devinit bcm63xx_trng_probe(struct platform_device *pdev)
+{
+ struct resource *r;
+ struct clk *clk;
diff --git a/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch b/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch
new file mode 100644
index 0000000000..ae4157774a
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.3/106-bcm63xx_watchdog_section_mismatch.patch
@@ -0,0 +1,20 @@
+--- a/drivers/watchdog/bcm63xx_wdt.c
++++ b/drivers/watchdog/bcm63xx_wdt.c
+@@ -301,7 +301,7 @@ static void bcm63xx_wdt_shutdown(struct
+ bcm63xx_wdt_pause();
+ }
+
+-static struct platform_driver bcm63xx_wdt = {
++static struct platform_driver bcm63xx_wdt_driver = {
+ .probe = bcm63xx_wdt_probe,
+ .remove = __devexit_p(bcm63xx_wdt_remove),
+ .shutdown = bcm63xx_wdt_shutdown,
+@@ -311,7 +311,7 @@ static struct platform_driver bcm63xx_wd
+ }
+ };
+
+-module_platform_driver(bcm63xx_wdt);
++module_platform_driver(bcm63xx_wdt_driver);
+
+ MODULE_AUTHOR("Miguel Gaio <miguel.gaio@efixo.com>");
+ MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>");
diff --git a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
index fd242f6a4f..0fff4d0b1b 100644
--- a/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
+++ b/target/linux/brcm63xx/patches-3.3/800-wl_exports.patch
@@ -24,7 +24,7 @@
if (nvram.version <= 4)
--- a/arch/mips/mm/cache.c
+++ b/arch/mips/mm/cache.c
-@@ -57,6 +57,7 @@ void (*_dma_cache_wback)(unsigned long s
+@@ -58,6 +58,7 @@ void (*_dma_cache_wback)(unsigned long s
void (*_dma_cache_inv)(unsigned long start, unsigned long size);
EXPORT_SYMBOL(_dma_cache_wback_inv);