Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b753a15 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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>
parents 8d97b849 2ccdcfee

include/asm-s390/types.h

+2 −2
Original line number Diff line number Diff line
@@ -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__