diff options
| author | Sylvain Munaut <tnt@246tnt.com> | 2005-03-30 16:28:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-30 16:28:30 -0800 |
| commit | cdb577046749f8a6aa6c8e515cfccea2f52f4af0 (patch) | |
| tree | 179555aa62a73561ab22d3807c73a9bc14e28626 | |
| parent | 6f574f647a9de09f8a4c636fee6501b6cc1f3872 (diff) | |
| download | history-cdb577046749f8a6aa6c8e515cfccea2f52f4af0.tar.gz | |
[PATCH] ppc32: Remove unnecessary test in MPC52xx reset code
That test is part of an old version of the code and erroneously made it to
mainstream.
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/ppc/syslib/mpc52xx_setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c index c0ecb24210c39..13bd85907d7fa 100644 --- a/arch/ppc/syslib/mpc52xx_setup.c +++ b/arch/ppc/syslib/mpc52xx_setup.c @@ -46,11 +46,8 @@ mpc52xx_restart(char *cmd) /* Turn on the watchdog and wait for it to expire. It effectively does a reset */ - if (gpt0 != NULL) { - out_be32(&gpt0->count, 0x000000ff); - out_be32(&gpt0->mode, 0x00009004); - } else - printk(KERN_ERR "mpc52xx_restart: Unable to ioremap GPT0 registers, -> looping ..."); + out_be32(&gpt0->count, 0x000000ff); + out_be32(&gpt0->mode, 0x00009004); while (1); } |