Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

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

diff --git a/include/asm-xtensa/system.h b/include/asm-xtensa/system.h
index 9284867f1cb90616cfba4af95b14f42f3059cdd5..f986170bd2a15416c5e6e94ec686f11fbb975c09 100644 (file)
--- a/include/asm-xtensa/system.h
+++ b/include/asm-xtensa/system.h
@@ -11,7 +11,6 @@
 #ifndef _XTENSA_SYSTEM_H
 #define _XTENSA_SYSTEM_H
 
-#include <linux/config.h>
 #include <linux/stringify.h>
 
 #include <asm/processor.h>
@@ -111,8 +110,6 @@ extern void *_switch_to(void *last, void *next);
 
 #endif /* __ASSEMBLY__ */
 
-#define prepare_to_switch()    do { } while(0)
-
 #define switch_to(prev,next,last)              \
 do {                                           \
        clear_cpenable();                       \