Merge branch 'master' of /home/sam/kernel/linux-2.6/

[pandora-kernel.git] / arch / mips / momentum / ocelot_c / reset.c

diff --git a/arch/mips/momentum/ocelot_c/reset.c b/arch/mips/momentum/ocelot_c/reset.c
index 6a2489f..3fdcb64 100644 (file)
--- a/arch/mips/momentum/ocelot_c/reset.c
+++ b/arch/mips/momentum/ocelot_c/reset.c
@@ -14,7 +14,6 @@
  * Louis Hamilton, Red Hat, Inc.
  * hamilton@redhat.com  [MIPS64 modifications]
  */
-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <asm/io.h>
@@ -34,7 +33,7 @@ void momenco_ocelot_restart(char *command)
                0xfc807000;
 #endif
 
-       /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
+       /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
        writeb(0x84, nvram + 0xff7);
 
        /* wait for the watchdog to go off */