X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Farch-sa1100%2Fsystem.h;h=6f52118ba1a47a9da2cb8bbeb00266e7967d244a;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=c0bbe24bf014ff9d44c2b953e433be7b9f781875;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;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..6f52118ba 100644
--- a/include/asm-arm/arch-sa1100/system.h
+++ b/include/asm-arm/arch-sa1100/system.h
@@ -10,13 +10,6 @@ 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