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

[u-boot] / include / configs / jupiter.h

diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h
index aaff553d3811c6799f75a258e84e228677cf08b4..e073528633714183cb3c7d2b00ed437e27160b5a 100644 (file)
--- a/include/configs/jupiter.h
+++ b/include/configs/jupiter.h
@@ -44,10 +44,8 @@
  * 0x40000000 - 0x4fffffff - PCI Memory
  * 0x50000000 - 0x50ffffff - PCI IO Space
  */
-/*#define CONFIG_PCI           */
 
 #if defined(CONFIG_PCI)
-#define CONFIG_PCI_PNP         1
 #define CONFIG_PCI_SCAN_SHOW   1
 #define CONFIG_PCIAUTO_SKIP_HOST_BRIDGE        1