Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / powerpc / platforms / 83xx / misc.c

diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c
index 0eb3d99..f0c6df6 100644 (file)
--- a/arch/powerpc/platforms/83xx/misc.c
+++ b/arch/powerpc/platforms/83xx/misc.c
@@ -9,7 +9,6 @@
  * option) any later version.
  */
 
-#include <linux/config.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 
@@ -35,7 +34,7 @@ void mpc83xx_restart(char *cmd)
        out_be32(reg + (RST_PROT_REG >> 2), 0x52535445);
 
        /* set software hard reset */
-       out_be32(reg + (RST_CTRL_REG >> 2), 0x52535445);
+       out_be32(reg + (RST_CTRL_REG >> 2), 0x2);
        for (;;) ;
 }