diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-15 00:34:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-15 00:34:44 -0700 |
commit | 63fe46da9c380b3f2bbdf3765044649517cc717c (patch) | |
tree | 9478c1aca1d692b408955aea20c9cd9a37e589c0 /include/asm-s390/types.h | |
parent | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (diff) | |
parent | 066b2118976e6e7cc50eed39e2747c75343a23c4 (diff) | |
download | op-kernel-dev-63fe46da9c380b3f2bbdf3765044649517cc717c.zip op-kernel-dev-63fe46da9c380b3f2bbdf3765044649517cc717c.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
drivers/net/wireless/rt2x00/rt61pci.c
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 78dda03..0e959e2 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__ |