[CPUFREQ] Fix up merge conflicts with recent ACPI changes.

Signed-off-by: Dave Jones <davej@redhat.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index fcacfe291b9b..f1d2899e9a62 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -11,6 +11,8 @@ menu "Processor type and features"
 
 config IA64
         bool
+        select PCI if (!IA64_HP_SIM)
+        select ACPI if (!IA64_HP_SIM)
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
@@ -28,7 +30,6 @@ config MMU
 
 config SWIOTLB
        bool
-       default y
 
 config RWSEM_XCHGADD_ALGORITHM
         bool
@@ -84,10 +85,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 +104,7 @@ config IA64_GENERIC
 
 config IA64_DIG
         bool "DIG-compliant"
+        select SWIOTLB
 
 config IA64_HP_ZX1
         bool "HP-zx1/sx1000"
@@ -113,6 +114,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 +133,7 @@ config IA64_SGI_SN2
 
 config IA64_HP_SIM
         bool "Ski-simulator"
+        select SWIOTLB
 
 endchoice