summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-29 19:35:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-29 19:35:07 +0000
commitfba670013d538719d13f103b2a5b4b06bdca202b (patch)
treef7b97d71161a17619e0ba92ffbef5ec2e7823776 /drivers/usb
parent7577fdfa52438a19e7e8abedb6efc645986af2ae (diff)
parente856359685143a2f65876e7db4e4aa0ef5dce7f0 (diff)
downloadlinux-stable-fba670013d538719d13f103b2a5b4b06bdca202b.tar.gz
linux-stable-fba670013d538719d13f103b2a5b4b06bdca202b.tar.bz2
linux-stable-fba670013d538719d13f103b2a5b4b06bdca202b.zip
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.c4
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 @@
#include <mach/hardware.h>
#include <mach/regs-gpio.h>
-#include <asm/plat-s3c24xx/regs-udc.h>
-#include <asm/plat-s3c24xx/udc.h>
+#include <plat/regs-udc.h>
+#include <plat/udc.h>
#include "s3c2410_udc.h"