1 files changed, 12 insertions, 3 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index f1e7cc1389b0..09866581a326 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -11,6 +11,9 @@ menu "Processor type and features"
 
 config IA64
         bool
+        select PCI if (!IA64_HP_SIM)
+        select ACPI if (!IA64_HP_SIM)
+        select PM if (!IA64_HP_SIM)
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
@@ -20,15 +23,19 @@ config IA64
 
 config 64BIT
         bool
+        select ATA_NONSTANDARD if ATA
         default y
 
+config ZONE_DMA
+        def_bool y
+        depends on !IA64_SGI_SN2
+
 config MMU
         bool
         default y
 
 config SWIOTLB
        bool
-       default y
 
 config RWSEM_XCHGADD_ALGORITHM
         bool
@@ -84,10 +91,9 @@ choice
 
 config IA64_GENERIC
         bool "generic"
-        select ACPI
-        select PCI
         select NUMA
         select ACPI_NUMA
+        select SWIOTLB
         help
           This selects the system type of your hardware.  A "generic" kernel
           will run on any supported IA-64 system.  However, if you configure
@@ -104,6 +110,7 @@ config IA64_GENERIC
 
 config IA64_DIG
         bool "DIG-compliant"
+        select SWIOTLB
 
 config IA64_HP_ZX1
         bool "HP-zx1/sx1000"
@@ -113,6 +120,7 @@ config IA64_HP_ZX1
 
 config IA64_HP_ZX1_SWIOTLB
         bool "HP-zx1/sx1000 with software I/O TLB"
+        select SWIOTLB
         help
           Build a kernel that runs on HP zx1 and sx1000 systems even when they
           have broken PCI devices which cannot DMA to full 32 bits.  Apart
@@ -131,6 +139,7 @@ config IA64_SGI_SN2
 
 config IA64_HP_SIM
         bool "Ski-simulator"
+        select SWIOTLB
 
 endchoice