Merge git://git.denx.de/u-boot-spi

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

diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h
index 8e13df5..0535d6a 100644 (file)
--- a/include/configs/sun5i.h
+++ b/include/configs/sun5i.h
@@ -12,16 +12,12 @@
  * High Level Configuration Options
  */
 
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_SUNXI
-#define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #endif
 
 #define CONFIG_SUNXI_USB_PHYS  2
 
-/* \todo A13 only defines port 19, whereas A10s requires each of these */
-#define CONFIG_NAND_SUNXI_GPC_PORTS    {16, 17, 18, 19}
-
 /*
  * Include common sunxi configuration where most the settings are
  */