From: Andrew Morton Fix git conflicts Cc: Wim Van Sebroeck Signed-off-by: Andrew Morton --- drivers/watchdog/Kconfig | 3 --- drivers/watchdog/Makefile | 3 --- 2 files changed, 6 deletions(-) diff -puN drivers/watchdog/Kconfig~git-watchdog-fixup drivers/watchdog/Kconfig --- a/drivers/watchdog/Kconfig~git-watchdog-fixup +++ a/drivers/watchdog/Kconfig @@ -405,8 +405,6 @@ config IT8712F_WDT To compile this driver as a module, choose M here: the module will be called it8712f_wdt. -<<<<<<< HEAD:drivers/watchdog/Kconfig -======= config HP_WATCHDOG tristate "HP Proliant iLO 2 Hardware Watchdog Timer" depends on X86 @@ -419,7 +417,6 @@ config HP_WATCHDOG To compile this driver as a module, choose M here: the module will be called hpwdt. ->>>>>>> FETCH_HEAD:drivers/watchdog/Kconfig config SC1200_WDT tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog" depends on X86 diff -puN drivers/watchdog/Makefile~git-watchdog-fixup drivers/watchdog/Makefile --- a/drivers/watchdog/Makefile~git-watchdog-fixup +++ a/drivers/watchdog/Makefile @@ -69,11 +69,8 @@ obj-$(CONFIG_WAFER_WDT) += wafer5823wdt. obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o obj-$(CONFIG_IT8712F_WDT) += it8712f_wdt.o -<<<<<<< HEAD:drivers/watchdog/Makefile -======= CFLAGS_hpwdt.o += -O obj-$(CONFIG_HP_WATCHDOG) += hpwdt.o ->>>>>>> FETCH_HEAD:drivers/watchdog/Makefile obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o obj-$(CONFIG_PC87413_WDT) += pc87413_wdt.o _