X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-sa1100%2Fsystem.h;h=aef91e3b63fe60dc1eb948a23e3bf85dc0ac6a3e;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=c0bbe24bf014ff9d44c2b953e433be7b9f781875;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-arm/arch-sa1100/system.h b/include/asm-arm/arch-sa1100/system.h
index c0bbe24bf..aef91e3b6 100644
--- 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