diff options
| author | Minkyu Kang <[email protected]> | 2010-03-23 19:09:13 +0900 |
|---|---|---|
| committer | Minkyu Kang <[email protected]> | 2010-03-23 19:09:13 +0900 |
| commit | 45e565337a90bbca0c1bb712b5e008b7c0b18bd5 (patch) | |
| tree | 8bcaee16cda9d8f90f5b596566ad2122c6d8d86b /include/usb | |
| parent | 995a4b1d83a08223c82c1e15778b02e85e5bba51 (diff) | |
| parent | d650da2dd4af99967aabc43cccbd8f160eb4cea6 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
cpu/arm920t/ep93xx/timer.c
Signed-off-by: Minkyu Kang <[email protected]>
Diffstat (limited to 'include/usb')
| -rw-r--r-- | include/usb/musb_udc.h | 1 | ||||
| -rw-r--r--[-rwxr-xr-x] | include/usb/spr_udc.h | 0 |
2 files changed, 0 insertions, 1 deletions
diff --git a/include/usb/musb_udc.h b/include/usb/musb_udc.h index ef37dbbcc4a..be808fd516b 100644 --- a/include/usb/musb_udc.h +++ b/include/usb/musb_udc.h @@ -51,4 +51,3 @@ int udc_init(void); #endif /* CONFIG_USB_TTY */ #endif /* __MUSB_UDC_H__ */ - diff --git a/include/usb/spr_udc.h b/include/usb/spr_udc.h index 2c332d59991..2c332d59991 100755..100644 --- a/include/usb/spr_udc.h +++ b/include/usb/spr_udc.h |