diff options
author | Stefan Roese <sr@denx.de> | 2007-01-30 12:46:55 +0100 |
---|---|---|
committer | Stefan Roese <sr@denx.de> | 2007-01-30 12:46:55 +0100 |
commit | 73e815b7fc11478aee180909e990009ebdb26725 (patch) | |
tree | 0b50c86350509dc5be1d7cfef108d97eb3dc69fe /include/configs/p3mx.h | |
parent | aa962c15bfc5dc4b8875abed818a43989f063641 (diff) | |
parent | b78bb469f536b357ee21c54f40201dbe4b201ac3 (diff) |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'include/configs/p3mx.h')
-rw-r--r-- | include/configs/p3mx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index 262e9d6acf..54462f007c 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -168,10 +168,12 @@ #define PCI_HOST_FORCE 1 /* configure as pci host */ #define PCI_HOST_AUTO 2 /* detected via arbiter enable */ -#define CONFIG_PCI /* include pci support */ +#undef CONFIG_PCI /* include pci support */ +#ifdef CONFIG_PCI #define CONFIG_PCI_HOST PCI_HOST_FORCE /* select pci host function */ #define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_SCAN_SHOW /* show devices on bus */ +#endif /* CONFIG_PCI */ /* PCI MEMORY MAP section */ #define CFG_PCI0_MEM_BASE 0x80000000 @@ -194,7 +196,6 @@ #define CFG_PCI1_IO_SPACE_PCI 0x00000000 #define CFG_ISA_IO_BASE_ADDRESS (CFG_PCI0_IO_BASE) - #define CFG_PCI_IDSEL 0x30 #undef CONFIG_BOOTARGS |