--- /dev/null
+--- 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>");
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);