Merge commit 'v2.6.28-rc2' into core/locking

[linux-2.6-omap-h63xx.git] / arch / um / include / asm / system.h

diff --git a/include/asm-um/system-generic.h b/arch/um/include/asm/system.h
similarity index 77%
rename from include/asm-um/system-generic.h
rename to arch/um/include/asm/system.h
index f1ea4da34fadb8d75c2fb740d5a1464ecc6e9adb..ae5f94d6317d584c051fbcea83533431e4b635d7 100644 (file)
--- a/include/asm-um/system-generic.h
+++ b/arch/um/include/asm/system.h
@@ -1,19 +1,7 @@
 #ifndef __UM_SYSTEM_GENERIC_H
 #define __UM_SYSTEM_GENERIC_H
 
-#include "asm/arch/system.h"
-
-#undef switch_to
-#undef raw_local_irq_save
-#undef raw_local_irq_restore
-#undef raw_local_irq_disable
-#undef raw_local_irq_enable
-#undef raw_local_save_flags
-#undef raw_local_irq_restore
-#undef raw_local_irq_enable
-#undef raw_local_irq_disable
-#undef raw_local_irq_save
-#undef irqs_disabled
+#include "sysdep/system.h"
 
 extern void *switch_to(void *prev, void *next, void *last);