SOURCES (LINUX_2_6): kernel-ia64.config - add missing options

[sparky]

Author: sparky                       Date: Sat Sep 27 18:47:16 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- add missing options

---- Files affected:
SOURCES:
   kernel-ia64.config (1.1.2.63 -> 1.1.2.64) 

---- Diffs:

================================================================
Index: SOURCES/kernel-ia64.config
diff -u SOURCES/kernel-ia64.config:1.1.2.63 SOURCES/kernel-ia64.config:1.1.2.64
--- SOURCES/kernel-ia64.config:1.1.2.63	Sat Sep 27 20:37:43 2008
+++ SOURCES/kernel-ia64.config	Sat Sep 27 20:47:10 2008
@@ -21,6 +21,7 @@
 # CONFIG_IA64_HP_ZX1 is not set
 # CONFIG_IA64_HP_ZX1_SWIOTLB is not set
 # CONFIG_IA64_SGI_SN2 is not set
+# CONFIG_IA64_SGI_UV is not set
 # CONFIG_IA64_HP_SIM is not set
 CONFIG_ITANIUM=y
 # CONFIG_MCKINLEY is not set
@@ -36,6 +37,7 @@
 CONFIG_IA64_CYCLONE=y
 CONFIG_IOSAPIC=y
 CONFIG_FORCE_MAX_ZONEORDER=17
+CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_NR_CPUS=64
 CONFIG_HOTPLUG_CPU=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
@@ -120,6 +122,13 @@
 CONFIG_IA64_ACPI_CPUFREQ=m
 
 #-
+#- *** FILE: arch/ia64/kvm/Kconfig ***
+#-
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+
+#-
 #- *** FILE: drivers/acpi/Kconfig ***
 #-
 CONFIG_ACPI=y
@@ -147,6 +156,7 @@
 #- *** FILE: drivers/ata/Kconfig ***
 #-
 CONFIG_ATA_NONSTANDARD=y
+CONFIG_ATA_ACPI=y
 CONFIG_PATA_PCMCIA=m
 
 #-
@@ -784,6 +794,7 @@
 CONFIG_PHANTOM=m
 CONFIG_EEPROM_93CX6=m
 CONFIG_SGI_IOC4=m
+CONFIG_SGI_XP=m
 
 #-
 #- *** FILE: drivers/mmc/card/Kconfig ***
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-ia64.config?r1=1.1.2.63&r2=1.1.2.64&f=u