diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-07-26 07:19:58 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-07-26 07:19:58 +0000 |
| commit | 0a80570a9c0d3ee0ca223e50ce149b1944393f7b (patch) | |
| tree | d5cedec9dca6d08d75cd6f3e716c72a67e9d75cf /target/linux/atheros/patches-3.10/130-watchdog.patch | |
| parent | 0ec41bc74eaedc98a8324bbfa006389e2b8ca22b (diff) | |
| download | upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.tar.gz upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.tar.bz2 upstream-0a80570a9c0d3ee0ca223e50ce149b1944393f7b.zip | |
kernel: update 3.10 to 3.10.3
Also refresh 3.10 patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37546 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.10/130-watchdog.patch')
| -rw-r--r-- | target/linux/atheros/patches-3.10/130-watchdog.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/atheros/patches-3.10/130-watchdog.patch b/target/linux/atheros/patches-3.10/130-watchdog.patch index 085f31547a..190c144996 100644 --- 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 -@@ -1077,6 +1077,12 @@ config LANTIQ_WDT +@@ -1104,6 +1104,12 @@ config LANTIQ_WDT help Hardware driver for the Lantiq SoC Watchdog Timer. @@ -217,7 +217,7 @@ # POWERPC Architecture --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o +@@ -130,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 |