projects
/
openwrt
/
svn-archive
/
archive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.10 to 3.10.3
[openwrt/svn-archive/archive.git]
/
target
/
linux
/
atheros
/
patches-3.10
/
130-watchdog.patch
diff --git
a/target/linux/atheros/patches-3.10/130-watchdog.patch
b/target/linux/atheros/patches-3.10/130-watchdog.patch
index 085f31547ae87a4afcd3551d400935ba04c336e5..190c14499657af0225f296dedb0e5a9abeb28b21 100644
(file)
--- a/
target/linux/atheros/patches-3.10/130-watchdog.patch
+++ b/
target/linux/atheros/patches-3.10/130-watchdog.patch
@@
-202,7
+202,7
@@
+module_exit(exit_ar2315_wdt);
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
+module_exit(exit_ar2315_wdt);
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
-@@ -1
077,6 +1077
,12 @@ config LANTIQ_WDT
+@@ -1
104,6 +1104
,12 @@ config LANTIQ_WDT
help
Hardware driver for the Lantiq SoC Watchdog Timer.
help
Hardware driver for the Lantiq SoC Watchdog Timer.
@@
-217,7
+217,7
@@
# POWERPC Architecture
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
# POWERPC Architecture
--- a/drivers/watchdog/Makefile
+++ b/drivers/watchdog/Makefile
-@@ -1
28,6 +128
,7 @@ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
+@@ -1
30,6 +130
,7 @@ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o