diff for duplicates of <1258051520.2280.3@antares> diff --git a/a/1.txt b/N1/1.txt index 972a9f9..21541c7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,12 @@ Remove the old WDT implementation. -Signed-off-by: Albrecht Dre=DF <albrecht.dress@arcor.de> +Signed-off-by: Albrecht Dreß <albrecht.dress@arcor.de> --- Change against v1: WDT stuff now fully merged into the file arch/powerpc/platforms/52xx/mpc52xx_gpt.c. -Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be= - removed. +Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed. drivers/watchdog/Kconfig | 4 +++- drivers/watchdog/Makefile | 1 - @@ -19,25 +18,25 @@ index 3711b88..d958b76 100644 +++ b/drivers/watchdog/Kconfig @@ -861,8 +861,10 @@ config GEF_WDT Watchdog timer found in a number of GE Fanuc single board computers. -=20 + config MPC5200_WDT - tristate "MPC5200 Watchdog Timer" + bool "MPC52xx Watchdog Timer" depends on PPC_MPC52xx + help + Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog. -=20 + config 8xxx_WDT tristate "MPC8xxx Platform Watchdog Timer" diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 699199b..89c045d 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile -@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) +=3D txx9wdt.o -=20 +@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o + # POWERPC Architecture - obj-$(CONFIG_GEF_WDT) +=3D gef_wdt.o --obj-$(CONFIG_MPC5200_WDT) +=3D mpc5200_wdt.o - obj-$(CONFIG_8xxx_WDT) +=3D mpc8xxx_wdt.o - obj-$(CONFIG_MV64X60_WDT) +=3D mv64x60_wdt.o - obj-$(CONFIG_PIKA_WDT) +=3D pika_wdt.o + obj-$(CONFIG_GEF_WDT) += gef_wdt.o +-obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o + obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o + obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o + obj-$(CONFIG_PIKA_WDT) += pika_wdt.o diff --git a/a/content_digest b/N1/content_digest index edb2162..35da2e1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,14 +10,13 @@ "b\0" "Remove the old WDT implementation.\n" "\n" - "Signed-off-by: Albrecht Dre=DF <albrecht.dress@arcor.de>\n" + "Signed-off-by: Albrecht Dre\303\237 <albrecht.dress@arcor.de>\n" "---\n" "\n" "Change against v1: WDT stuff now fully merged into the file\n" "arch/powerpc/platforms/52xx/mpc52xx_gpt.c.\n" "\n" - "Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be=\n" - " removed.\n" + "Note: The file drivers/watchdog/mpc5200_wdt.c is now obsolete and should be removed.\n" "\n" " drivers/watchdog/Kconfig | 4 +++-\n" " drivers/watchdog/Makefile | 1 -\n" @@ -29,27 +28,27 @@ "+++ b/drivers/watchdog/Kconfig\n" "@@ -861,8 +861,10 @@ config GEF_WDT\n" " \t Watchdog timer found in a number of GE Fanuc single board computers.\n" - "=20\n" + " \n" " config MPC5200_WDT\n" "-\ttristate \"MPC5200 Watchdog Timer\"\n" "+\tbool \"MPC52xx Watchdog Timer\"\n" " \tdepends on PPC_MPC52xx\n" "+\thelp\n" "+\t Use General Purpose Timer (GPT) 0 on the MPC5200 as Watchdog.\n" - "=20\n" + " \n" " config 8xxx_WDT\n" " \ttristate \"MPC8xxx Platform Watchdog Timer\"\n" "diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile\n" "index 699199b..89c045d 100644\n" "--- a/drivers/watchdog/Makefile\n" "+++ b/drivers/watchdog/Makefile\n" - "@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) +=3D txx9wdt.o\n" - "=20\n" + "@@ -118,7 +118,6 @@ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o\n" + " \n" " # POWERPC Architecture\n" - " obj-$(CONFIG_GEF_WDT) +=3D gef_wdt.o\n" - "-obj-$(CONFIG_MPC5200_WDT) +=3D mpc5200_wdt.o\n" - " obj-$(CONFIG_8xxx_WDT) +=3D mpc8xxx_wdt.o\n" - " obj-$(CONFIG_MV64X60_WDT) +=3D mv64x60_wdt.o\n" - obj-$(CONFIG_PIKA_WDT) +=3D pika_wdt.o + " obj-$(CONFIG_GEF_WDT) += gef_wdt.o\n" + "-obj-$(CONFIG_MPC5200_WDT) += mpc5200_wdt.o\n" + " obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o\n" + " obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o\n" + obj-$(CONFIG_PIKA_WDT) += pika_wdt.o -1af9271888684d652d14b47d376aa110d176de70231d0903dc45d168ce5b4fc2 +507b64916b698e0e58fbfe164167206694ebe62cff060badab799109e103d249
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.