Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / aria.h

diff --git a/include/configs/aria.h b/include/configs/aria.h
index ec13b584a6a1fa0c266c98bd761e0f9e59c122b3..f385852cdcc83c88380749af4affd6c2dcfc9776 100644 (file)
--- a/include/configs/aria.h
+++ b/include/configs/aria.h
@@ -38,10 +38,6 @@
 
 /* video */
 
-#if defined(CONFIG_VIDEO)
-#define CONFIG_VGA_AS_SINGLE_DEVICE
-#endif
-
 /* CONFIG_PCI is defined at config time */
 
 #define CONFIG_SYS_MPC512X_CLKIN       33000000        /* in Hz */
@@ -341,8 +337,6 @@
 #define CONFIG_SYS_PCI_IO_PHYS         0x84000000
 #define CONFIG_SYS_PCI_IO_SIZE         0x01000000      /* 16M */
 
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play */
-
 #define CONFIG_PCI_SCAN_SHOW           /* show pci devices on startup */
 
 #endif