@@ -35,21 +35,6 @@ CONFIG_VGA_CIRRUS=y
CONFIG_SMBUS_EEPROM=y
# For Macs
-CONFIG_ESCC=y
-CONFIG_MACIO=y
-CONFIG_MACIO_GPIO=y
-CONFIG_SUNGEM=y
-CONFIG_MOS6522=y
-CONFIG_CUDA=y
-CONFIG_ADB=y
-CONFIG_MAC_NVRAM=y
-CONFIG_MAC_DBDMA=y
-CONFIG_MAC_PMU=y
-CONFIG_HEATHROW_PIC=y
-CONFIG_GRACKLE_PCI=y
-CONFIG_UNIN_PCI=y
-CONFIG_DEC_PCI=y
-CONFIG_IDE_MACIO=y
CONFIG_MAC_OLDWORLD=y
CONFIG_MAC_NEWWORLD=y
@@ -57,6 +57,12 @@ config MOS6522
config MACIO
bool
+ select CUDA
+ select ESCC
+ select IDE_MACIO
+ select MAC_DBDMA
+ select MAC_NVRAM
+ select MOS6522
config IVSHMEM_DEVICE
bool
@@ -86,6 +86,7 @@ config FTGMAC100
config SUNGEM
bool
+ depends on PCI
config COLDFIRE
bool
@@ -10,8 +10,10 @@ config GRACKLE_PCI
bool
config UNIN_PCI
- select PCI
bool
+ select PCI
+ select DEC_PCI
+ select OPENPIC
config PPCE500_PCI
select PCI
@@ -55,9 +55,24 @@ config RS6000_MC
config MAC_OLDWORLD
bool
+ imply PCI_DEVICES
+ imply SUNGEM
+ imply TEST_DEVICES
+ select ADB
+ select GRACKLE_PCI
+ select HEATHROW_PIC
+ select MACIO
config MAC_NEWWORLD
bool
+ imply PCI_DEVICES
+ imply SUNGEM
+ imply TEST_DEVICES
+ select ADB
+ select MACIO
+ select MACIO_GPIO
+ select MAC_PMU
+ select UNIN_PCI
config E500
bool