diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 14:39:18 +0400 |
| commit | 170465ee7f5a9a2d0ac71285507e52642e040353 (patch) | |
| tree | dbca81f04cde9e625170abbd6a72555cfbeb194e /arch/arm/mach-s3c2410/usb-simtec.c | |
| parent | 169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
| download | linux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/arm/mach-s3c2410/usb-simtec.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index 6aec86a5da56..4dacf8a1750d 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c @@ -26,12 +26,12 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -#include <asm/arch/bast-map.h> -#include <asm/arch/bast-irq.h> -#include <asm/arch/usb-control.h> -#include <asm/arch/regs-gpio.h> +#include <mach/bast-map.h> +#include <mach/bast-irq.h> +#include <mach/usb-control.h> +#include <mach/regs-gpio.h> -#include <asm/hardware.h> +#include <mach/hardware.h> #include <asm/io.h> #include <asm/irq.h> |