diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 09:50:03 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-03-23 16:20:20 -0400 |
| commit | 80c5520811d3805adcb15c570ea5e2d489fa5d0b (patch) | |
| tree | ae797a7f4af39f80e77526533d06ac23b439f0ab /arch/arm/include/asm/swab.h | |
| parent | b3e3b302cf6dc8d60b67f0e84d1fa5648889c038 (diff) | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
Merge branch 'cpus4096' into irq/threaded
Conflicts:
arch/parisc/kernel/irq.c
kernel/irq/handle.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/include/asm/swab.h')
| -rw-r--r-- | arch/arm/include/asm/swab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h index 27a689be085..ca2bf2f6d6e 100644 --- a/arch/arm/include/asm/swab.h +++ b/arch/arm/include/asm/swab.h | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #define __ASM_ARM_SWAB_H | 16 | #define __ASM_ARM_SWAB_H |
| 17 | 17 | ||
| 18 | #include <linux/compiler.h> | 18 | #include <linux/compiler.h> |
| 19 | #include <asm/types.h> | 19 | #include <linux/types.h> |
| 20 | 20 | ||
| 21 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | 21 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) |
| 22 | # define __SWAB_64_THRU_32__ | 22 | # define __SWAB_64_THRU_32__ |