Merge git://git.infradead.org/mtd-2.6

[pandora-kernel.git] / include / asm-s390 / setup.h

diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index f09ee3f..2bd9fae 100644 (file)
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -77,7 +77,6 @@ extern unsigned long machine_flags;
 
 #define MACHINE_IS_VM          (machine_flags & MACHINE_FLAG_VM)
 #define MACHINE_IS_KVM         (machine_flags & MACHINE_FLAG_KVM)
-#define MACHINE_IS_P390                (machine_flags & MACHINE_FLAG_P390)
 #define MACHINE_HAS_DIAG9C     (machine_flags & MACHINE_FLAG_DIAG9C)
 
 #ifndef __s390x__