diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-29 14:35:07 -0500 |
| commit | fba670013d538719d13f103b2a5b4b06bdca202b (patch) | |
| tree | f7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/usb | |
| parent | 7577fdfa52438a19e7e8abedb6efc645986af2ae (diff) | |
| parent | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff) | |
Merge branch 's3c-moves2' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/s3c2410_udc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c index 00ba06b44752..8d8d65165983 100644 --- a/drivers/usb/gadget/s3c2410_udc.c +++ b/drivers/usb/gadget/s3c2410_udc.c | |||
| @@ -53,8 +53,8 @@ | |||
| 53 | #include <mach/hardware.h> | 53 | #include <mach/hardware.h> |
| 54 | #include <mach/regs-gpio.h> | 54 | #include <mach/regs-gpio.h> |
| 55 | 55 | ||
| 56 | #include <asm/plat-s3c24xx/regs-udc.h> | 56 | #include <plat/regs-udc.h> |
| 57 | #include <asm/plat-s3c24xx/udc.h> | 57 | #include <plat/udc.h> |
| 58 | 58 | ||
| 59 | 59 | ||
| 60 | #include "s3c2410_udc.h" | 60 | #include "s3c2410_udc.h" |