Merge branch 'master' of git://git.denx.de/u-boot-imx

[platform/kernel/u-boot.git] / include / configs / sun4i.h

diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h
index a3c9408..bd34969 100644 (file)
--- a/include/configs/sun4i.h
+++ b/include/configs/sun4i.h
@@ -12,13 +12,11 @@
  * A10 specific configuration
  */
 
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #endif
 
 #define CONFIG_SUNXI_USB_PHYS  3
-#define CONFIG_NAND_SUNXI_GPC_PORTS    {16, 17, 18, 19, 20, 21, 22, 24}
 
 /*
  * Include common sunxi configuration where most the settings are