[PATCHv2 3/3] mpc52xx/wdt: remove obsolete old WDT implementation

[Grant Likely]

On Thu, Nov 12, 2009 at 11:45 AM, Albrecht Dreß <albrecht.dress at arcor.de> wrote:
> Remove the old WDT implementation.
>
> Signed-off-by: Albrecht Dreß <albrecht.dress at arcor.de>

Acked-by: Grant Likely <grant.likely at secretlab.ca>

Wim, I'm picking up the other 2 patches into my tree.  Do you want me
to push this patch through my tree, or do you want to pick it up?

g.

> ---
>
> 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.
>
>  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.
>
>  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) += txx9wdt.o
>
>  # POWERPC Architecture
>  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
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.