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:
Linus Torvalds 2008-05-12 09:07:56 -07:00
commit 2b753a1599

View file

@ -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__