diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 06:04:41 -0500 |
| commit | b17304245f0db0ac69b795c411407808f3f2796d (patch) | |
| tree | 63ed3915d9295bd08f640bf25c322064ba787fad /arch/arm/mach-clps711x/fortunet.c | |
| parent | 889c92d21db40be0b7d22a59395060237895bb85 (diff) | |
| parent | 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 (diff) | |
Merge branch 'linus' into x86/setup-lzma
Conflicts:
init/do_mounts_rd.c
Diffstat (limited to 'arch/arm/mach-clps711x/fortunet.c')
| -rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index 7122b3d21043..7430e4049d87 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/initrd.h> | 24 | #include <linux/initrd.h> |
| 25 | 25 | ||
| 26 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
| 27 | #include <asm/irq.h> | ||
| 28 | #include <asm/setup.h> | 27 | #include <asm/setup.h> |
| 29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 30 | 29 | ||