diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:24 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-17 17:12:24 +0200 |
| commit | 538f0fd0f210c2ce5c585799f18d0e5c7cf6155e (patch) | |
| tree | e9fa2b10ce5d92ac6bcd8ac55af1cd97bda3ec5d /include/asm-s390/types.h | |
| parent | 3bb6fbf9969a8bbe4892968659239273d092e78a (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linus' into x86/garttip-x86-gart-2008-05-17-15-12-25
Diffstat (limited to 'include/asm-s390/types.h')
| -rw-r--r-- | include/asm-s390/types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h index 78dda038dd47..0e959e20e9a3 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__ |