ipv4: clean the init_ipv4_mibs error paths

[linux-2.6] / include / asm-s390 / setup.h

diff --git a/include/asm-s390/setup.h b/include/asm-s390/setup.h
index 80747ba6ef8a4aa352b32e40ef76b3030cc7196a..4ba14e463e838ad6366673eceea62377ccb96c99 100644 (file)
--- a/include/asm-s390/setup.h
+++ b/include/asm-s390/setup.h
@@ -78,7 +78,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__
@@ -101,7 +100,6 @@ extern unsigned long machine_flags;
 #define MACHINE_HAS_PFMF       (machine_flags & MACHINE_FLAG_PFMF)
 #endif /* __s390x__ */
 
-#define MACHINE_HAS_SCLP       (!MACHINE_IS_P390)
 #define ZFCPDUMP_HSA_SIZE      (32UL<<20)
 
 /*