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

[u-boot] / configs / Mini-X_defconfig

diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 31d6217cda6ce66afdfb69649a12b975c91cb334..53f9bfe9cb60a4943e6f76841f769ef27b215c2d 100644 (file)
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -1,12 +1,11 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
 CONFIG_MACH_SUN4I=y
-CONFIG_VIDEO_COMPOSITE=y
 CONFIG_USB0_VBUS_PIN="PB9"
+CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set