aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 09:07:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-12 09:07:56 -0700
commit2b753a1599a28612851a2908abdbf86802c989c5 (patch)
tree896164b6d9835bdc7a1b1900e614d7eb0bd43ba8
parent8d97b84935b28ed8944d1be31859a3df7ebe93ae (diff)
parent2ccdcfeeca6a1888180ffc4a1ab097f1fb2bd029 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes
* git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes: types: s390: fix #ifdef reversal in <asm-s390/types.h>
-rw-r--r--include/asm-s390/types.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index 78dda038dd4..0e959e20e9a 100644
--- 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__