diff options
author | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-12-01 12:10:51 +0100 |
commit | 57bf140ac66f95c9c36c494e4d027551b5477b01 (patch) | |
tree | 78cc2602ee9dca3284e47f38d29380171fb53646 /cpu/arm920t/s3c24x0/usb_ohci.c | |
parent | 34ddbd171ba154e9afd83f07a07ad8b57ac592e3 (diff) | |
parent | 71636fa7c3de63de29c0f514d5c725eccb011657 (diff) | |
download | talos-obmc-uboot-57bf140ac66f95c9c36c494e4d027551b5477b01.tar.gz talos-obmc-uboot-57bf140ac66f95c9c36c494e4d027551b5477b01.zip |
Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into next
Diffstat (limited to 'cpu/arm920t/s3c24x0/usb_ohci.c')
-rw-r--r-- | cpu/arm920t/s3c24x0/usb_ohci.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cpu/arm920t/s3c24x0/usb_ohci.c b/cpu/arm920t/s3c24x0/usb_ohci.c index 7672e4ce11..5aa8d64a55 100644 --- a/cpu/arm920t/s3c24x0/usb_ohci.c +++ b/cpu/arm920t/s3c24x0/usb_ohci.c @@ -36,14 +36,9 @@ #include <common.h> /* #include <pci.h> no PCI on the S3C24X0 */ -#ifdef CONFIG_USB_OHCI - -#if defined(CONFIG_S3C2400) -#include <s3c2400.h> -#elif defined(CONFIG_S3C2410) -#include <s3c2410.h> -#endif +#if defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0) +#include <asm/arch/s3c24x0_cpu.h> #include <asm/io.h> #include <malloc.h> #include <usb.h> @@ -1757,4 +1752,4 @@ int usb_lowlevel_stop(void) return 0; } -#endif /* CONFIG_USB_OHCI */ +#endif /* defined(CONFIG_USB_OHCI) && defined(CONFIG_S3C24X0) */ |