diff options
author | Wolfgang Denk <wd@denx.de> | 2008-05-09 22:18:58 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-05-09 22:18:58 +0200 |
commit | 356cd17cc289e2dac409d21607618650d6f388a5 (patch) | |
tree | fce11759308e036087dd5197f52d54a8d0602ae7 /cpu/arm920t/s3c24x0 | |
parent | ef2642625cbfb1c3695e3478d08ae515052a4950 (diff) | |
parent | 726c0f1e5f108dccea052965123b95837d2bd402 (diff) | |
download | u-boot-imx-356cd17cc289e2dac409d21607618650d6f388a5.zip u-boot-imx-356cd17cc289e2dac409d21607618650d6f388a5.tar.gz u-boot-imx-356cd17cc289e2dac409d21607618650d6f388a5.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/master/
Diffstat (limited to 'cpu/arm920t/s3c24x0')
-rw-r--r-- | cpu/arm920t/s3c24x0/usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/arm920t/s3c24x0/usb.c b/cpu/arm920t/s3c24x0/usb.c index ef5d5bf..421ebb4 100644 --- a/cpu/arm920t/s3c24x0/usb.c +++ b/cpu/arm920t/s3c24x0/usb.c @@ -69,4 +69,4 @@ int usb_cpu_init_fail (void) } # endif /* defined(CONFIG_S3C2400) || defined(CONFIG_S3C2410) */ -#endif /* defined(CONFIG_USB_OHCI) && defined(CFG_USB_OHCI_CPU_INIT) */ +#endif /* defined(CONFIG_USB_OHCI_NEW) && defined(CFG_USB_OHCI_CPU_INIT) */ |