diff options
| author | Russell King | 2008-10-14 23:24:51 +0200 |
|---|---|---|
| committer | Russell King | 2008-10-14 23:24:51 +0200 |
| commit | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (patch) | |
| tree | 0248fb8f7a3e445cc3c744252abeecabb9205c05 /arch/arm/mach-s3c2410/usb-simtec.c | |
| parent | Merge branch 'omap-all' into devel (diff) | |
| parent | [ARM] S3C24XX: Additional include moves (diff) | |
| download | kernel-qcow2-linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.tar.gz kernel-qcow2-linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.tar.xz kernel-qcow2-linux-7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4.zip | |
Merge branch 's3c-move' into devel
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'arch/arm/mach-s3c2410/usb-simtec.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/usb-simtec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/usb-simtec.c b/arch/arm/mach-s3c2410/usb-simtec.c index eb6fc0bfd47e..6078f09b7df5 100644 --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c @@ -35,7 +35,7 @@ #include <mach/hardware.h> #include <asm/irq.h> -#include <asm/plat-s3c24xx/devs.h> +#include <plat/devs.h> #include "usb-simtec.h" /* control power and monitor over-current events on various Simtec |