diff options
author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-22 15:06:09 +0100 |
---|---|---|
committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-12-22 15:06:09 +0100 |
commit | 257e7c347fd32438604da5e7996b902688d9611b (patch) | |
tree | 74fe0aa3fcaad4c9a3bd1c3dfc172531400cdd45 /drivers/usb/host/s3c64xx-hcd.c | |
parent | 0c9ff2faf4cf516dd6631ba18a4bcc5b739eb4c6 (diff) | |
parent | 87d93a1ba2ae23550e1370adb7a3b00af0831165 (diff) |
Merge branch 'master' of http://git.denx.de/u-boot
Conflicts:
include/usb/musb_udc.h
Diffstat (limited to 'drivers/usb/host/s3c64xx-hcd.c')
-rw-r--r-- | drivers/usb/host/s3c64xx-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/s3c64xx-hcd.c b/drivers/usb/host/s3c64xx-hcd.c index 274a4ed30..cd295dabb 100644 --- a/drivers/usb/host/s3c64xx-hcd.c +++ b/drivers/usb/host/s3c64xx-hcd.c @@ -25,7 +25,7 @@ */ #include <common.h> -#include <s3c6400.h> +#include <asm/arch/s3c6400.h> int usb_cpu_init(void) { |