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/serial/usbtty.h | |
| 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/serial/usbtty.h')
| -rw-r--r-- | drivers/serial/usbtty.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/usbtty.h b/drivers/serial/usbtty.h index c693dd5f0..adb7685a6 100644 --- a/drivers/serial/usbtty.h +++ b/drivers/serial/usbtty.h @@ -31,6 +31,8 @@ #include <usb/musb_udc.h> #elif defined(CONFIG_OMAP1510) #include <usb/omap1510_udc.h> +#elif defined(CONFIG_MUSB_UDC) +#include <usb/musb_udc.h> #elif defined(CONFIG_PXA27X) #include <usb/pxa27x_udc.h> #endif |