fixup machid workaround, generate uImage manually

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

diff --git a/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch b/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
index 695a455..78eb628 100644 (file)
--- a/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
+++ b/target/linux/adm5120/patches-2.6.25/310-adm5120_wdt.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.25.orig/drivers/watchdog/Kconfig
-+++ linux-2.6.25/drivers/watchdog/Kconfig
-@@ -619,6 +619,18 @@ config SBC_EPX_C3_WATCHDOG
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -619,6 +619,18 @@

  
  # MIPS Architecture
  
  
  # MIPS Architecture
  


@@ -21,11 +19,9 @@ Index: linux-2.6.25/drivers/watchdog/Kconfig
  config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG
  config INDYDOG
        tristate "Indy/I2 Hardware Watchdog"
        depends on SGI_HAS_INDYDOG

-Index: linux-2.6.25/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.25.orig/drivers/watchdog/Makefile
-+++ linux-2.6.25/drivers/watchdog/Makefile
-@@ -90,6 +90,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
+@@ -90,6 +90,7 @@

  # M68KNOMMU Architecture
  
  # MIPS Architecture
  # M68KNOMMU Architecture
  
  # MIPS Architecture