diff options
author | Tom Rini <trini@ti.com> | 2014-11-13 10:35:13 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-13 10:35:13 -0500 |
commit | 0d485b9095328cdc81b2ee94ff59b988c69b9127 (patch) | |
tree | 93406f5dfe78b0b5670272a9de3f3eb3ee419785 /include/configs/sun7i.h | |
parent | 3ad207a2bf1399a689233a97978e306f71729f77 (diff) | |
parent | 64a97599b79e277600bc6f1b22cf48aa04ee9bd0 (diff) | |
download | u-boot-imx-0d485b9095328cdc81b2ee94ff59b988c69b9127.zip u-boot-imx-0d485b9095328cdc81b2ee94ff59b988c69b9127.tar.gz u-boot-imx-0d485b9095328cdc81b2ee94ff59b988c69b9127.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include/configs/sun7i.h')
-rw-r--r-- | include/configs/sun7i.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 0193826..ea40790 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -19,14 +19,7 @@ #ifdef CONFIG_USB_EHCI #define CONFIG_USB_EHCI_SUNXI - #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#ifndef CONFIG_SUNXI_USB_VBUS0_GPIO -#define CONFIG_SUNXI_USB_VBUS0_GPIO SUNXI_GPH(6) -#endif -#ifndef CONFIG_SUNXI_USB_VBUS1_GPIO -#define CONFIG_SUNXI_USB_VBUS1_GPIO SUNXI_GPH(3) -#endif #endif #define CONFIG_ARMV7_VIRT 1 |