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>
This commit is contained in:
commit
2b753a1599
@ -10,9 +10,9 @@
|
|||||||
#define _S390_TYPES_H
|
#define _S390_TYPES_H
|
||||||
|
|
||||||
#ifndef __s390x__
|
#ifndef __s390x__
|
||||||
# include <asm-generic/int-l64.h>
|
|
||||||
#else
|
|
||||||
# include <asm-generic/int-ll64.h>
|
# include <asm-generic/int-ll64.h>
|
||||||
|
#else
|
||||||
|
# include <asm-generic/int-l64.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
|
Loading…
Reference in New Issue
Block a user