From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp5.netcologne.de (smtp5.netcologne.de [194.8.194.25]) by ozlabs.org (Postfix) with ESMTP id 8D8CAB7D7B for ; Fri, 13 Nov 2009 05:45:22 +1100 (EST) Date: Thu, 12 Nov 2009 19:45:20 +0100 From: Albrecht =?iso-8859-1?b?RHJl3w==?= Subject: [PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation To: "Likely, Grant" , Linux PPC Development , Devicetree Discussions , Wim Van Sebroeck Message-Id: <1258051520.2280.3@antares> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Remove the old WDT implementation. Signed-off-by: Albrecht Dre=DF --- 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. drivers/watchdog/Kconfig | 4 +++- drivers/watchdog/Makefile | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 3711b88..d958b76 100644 --- a/drivers/watchdog/Kconfig +++ 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 # 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