diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /arch/arm/mach-s3c2440/mach-anubis.c | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'arch/arm/mach-s3c2440/mach-anubis.c')
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-anubis.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2440/mach-anubis.c b/arch/arm/mach-s3c2440/mach-anubis.c index 441f4bc09472..19eb0e5269ac 100644 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/ata_platform.h> | 20 | #include <linux/ata_platform.h> |
| 21 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
| 22 | 22 | #include <linux/io.h> | |
| 23 | #include <linux/sm501.h> | 23 | #include <linux/sm501.h> |
| 24 | #include <linux/sm501-regs.h> | 24 | #include <linux/sm501-regs.h> |
| 25 | 25 | ||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <mach/anubis-cpld.h> | 32 | #include <mach/anubis-cpld.h> |
| 33 | 33 | ||
| 34 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 35 | #include <asm/io.h> | ||
| 36 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 37 | #include <asm/mach-types.h> | 36 | #include <asm/mach-types.h> |
| 38 | 37 | ||