diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:25:14 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:53:15 +0100 |
| commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 (patch) | |
| tree | a97493753a119e577161a4fb0b40b8edfc3923bb /include/configs/omap3_beagle.h | |
| parent | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (diff) | |
| parent | 2c072c958bb544c72f0e848375803dbd6971f022 (diff) | |
| download | blackbird-obmc-uboot-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.gz blackbird-obmc-uboot-ab6423cae0323e8db2c8fdd0a99138d93fde2137.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.
Conflicts:
board/samsung/common/board.c
Diffstat (limited to 'include/configs/omap3_beagle.h')
| -rw-r--r-- | include/configs/omap3_beagle.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ac0ed4371c..0b57421537 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -120,8 +120,9 @@ #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_SMSC95XX #define CONFIG_USB_ETHER_ASIX +#define CONFIG_USB_ETHER_MCS7830 +#define CONFIG_USB_ETHER_SMSC95XX /* GPIO banks */ #define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */ |
