From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/char/watchdog/Kconfig | 3 --- 1 file changed, 3 deletions(-) diff -puN drivers/char/watchdog/Kconfig~git-watchdog-fixup drivers/char/watchdog/Kconfig --- a/drivers/char/watchdog/Kconfig~git-watchdog-fixup +++ a/drivers/char/watchdog/Kconfig @@ -165,7 +165,6 @@ config EP93XX_WATCHDOG To compile this driver as a module, choose M here: the module will be called ep93xx_wdt. -<<<<<<< HEAD/drivers/char/watchdog/Kconfig config OMAP_WATCHDOG tristate "OMAP Watchdog" depends on WATCHDOG && (ARCH_OMAP16XX || ARCH_OMAP24XX) @@ -184,7 +183,6 @@ config PNX4008_WATCHDOG Say N if you are unsure. -======= config PNX4008_WATCHDOG tristate "PNX4008 Watchdog" depends on WATCHDOG && ARCH_PNX4008 @@ -196,7 +194,6 @@ config PNX4008_WATCHDOG Say N if you are unsure. ->>>>>>> /drivers/char/watchdog/Kconfig # X86 (i386 + ia64 + x86_64) Architecture config ACQUIRE_WDT _