diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 08:59:21 +0200 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /arch/arm/mach-s3c2410/mach-n30.c | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'arch/arm/mach-s3c2410/mach-n30.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-n30.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/mach-n30.c b/arch/arm/mach-s3c2410/mach-n30.c index 43c2e915c5b..80fe2ed0775 100644 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c @@ -26,15 +26,15 @@ #include <linux/serial_core.h> #include <linux/timer.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <asm/arch/fb.h> -#include <asm/arch/leds-gpio.h> -#include <asm/arch/regs-gpio.h> -#include <asm/arch/regs-lcd.h> +#include <mach/fb.h> +#include <mach/leds-gpio.h> +#include <mach/regs-gpio.h> +#include <mach/regs-lcd.h> #include <asm/mach/arch.h> #include <asm/mach/irq.h> |