ramips: merge slab patch

[openwrt.git] / target / linux / adm5120 / patches-2.6.34 / 310-adm5120_wdt.patch

diff --git a/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
index b7833c7..0c4e8e6 100644 (file)
--- a/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.34/310-adm5120_wdt.patch
@@ -1,6 +1,6 @@
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -790,6 +790,18 @@ config RC32434_WDT
+@@ -807,6 +807,18 @@ config RC32434_WDT
          To compile this driver as a module, choose M here: the
          module will be called rc32434_wdt.
  
@@ -21,7 +21,7 @@
        depends on SGI_HAS_INDYDOG
 --- a/drivers/watchdog/Makefile
 +++ b/drivers/watchdog/Makefile
-@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+@@ -113,6 +113,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
  obj-$(CONFIG_TXX9_WDT) += txx9wdt.o