Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-int…

…types * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: types: s390: fix #ifdef reversal in <asm-s390/types.h>
mariux64 · May 12, 2008 · 2b753a1 · 2b753a1
2 parents 8d97b84 + 2ccdcfe
commit 2b753a1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
@@ -10,9 +10,9 @@
 #define _S390_TYPES_H
 
 #ifndef __s390x__
-# include <asm-generic/int-l64.h>
-#else
 # include <asm-generic/int-ll64.h>
+#else
+# include <asm-generic/int-l64.h>
 #endif
 
 #ifndef __ASSEMBLY__