Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6] / include / asm-arm / arch-iop32x / system.h

diff --git a/include/asm-arm/arch-iop32x/system.h b/include/asm-arm/arch-iop32x/system.h
index c65ede3e627a9132c3458d9f737f0f0fdd441d0f..17b7eb7e9c0d523cdcb4a70d5dc3d63b70bdf451 100644 (file)
--- a/include/asm-arm/arch-iop32x/system.h
+++ b/include/asm-arm/arch-iop32x/system.h
@@ -8,6 +8,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <asm/mach-types.h>
+
 static inline void arch_idle(void)
 {
        cpu_do_idle();
@@ -15,6 +17,15 @@ static inline void arch_idle(void)
 
 static inline void arch_reset(char mode)
 {
+       local_irq_disable();
+
+       if (machine_is_n2100()) {
+               gpio_line_set(N2100_HARDWARE_RESET, GPIO_LOW);
+               gpio_line_config(N2100_HARDWARE_RESET, GPIO_OUT);
+               while (1)
+                       ;
+       }
+
        *IOP3XX_PCSR = 0x30;
 
        /* Jump into ROM at address 0 */