fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/asm-arm/arch-sa1100/system.h b/include/asm-arm/arch-sa1100/system.h
index c0bbe24..aef91e3 100644 (file)
--- a/include/asm-arm/arch-sa1100/system.h
+++ b/include/asm-arm/arch-sa1100/system.h
@@ -3,20 +3,13 @@
  *
  * Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
  */
-#include <linux/config.h>
+#include <asm/hardware.h>
 
 static inline void arch_idle(void)
 {
        cpu_do_idle();
 }
 
-#ifdef CONFIG_SA1100_VICTOR
-
-/* power off unconditionally */
-#define arch_reset(x) machine_power_off()
-
-#else
-
 static inline void arch_reset(char mode)
 {
        if (mode == 's') {
@@ -27,5 +20,3 @@ static inline void arch_reset(char mode)
                RSRR = RSRR_SWR;
        }
 }
-
-#endif