diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-06 14:26:51 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-06 14:26:51 +0100 |
| commit | c35cf8dc9fd90ff108abe08527df042bcd29a02f (patch) | |
| tree | a5b962854f9a1a2659207f41204840b2b98078bd /include/configs/omap3_beagle.h | |
| parent | 7988bd4ed6b48127ac8b45cf144255daabaa1250 (diff) | |
| parent | 18a02e8050b7af165efa72325753e7880bf5567c (diff) | |
| download | blackbird-obmc-uboot-c35cf8dc9fd90ff108abe08527df042bcd29a02f.tar.gz blackbird-obmc-uboot-c35cf8dc9fd90ff108abe08527df042bcd29a02f.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/omap3_beagle.h')
| -rw-r--r-- | include/configs/omap3_beagle.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 47d9902088..c662cc03de 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -118,9 +118,6 @@ #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 -#define CONFIG_USB_ULPI -#define CONFIG_USB_ULPI_VIEWPORT_OMAP - #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX |
