From 50f89b26c68e07fc2093e104ddf5314b9c951d76 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@redhat.com>
Date: Jan 13 2011 02:32:50 +0000
Subject: update kconfig for 2.6.37-git9


---

diff --git a/config-arm b/config-arm
index 0df8a46..bb746fa 100644
--- a/config-arm
+++ b/config-arm
@@ -89,6 +89,8 @@ CONFIG_USB_TUSB6010=y
 # CONFIG_USB_MUSB_DEBUG is not set
 
 CONFIG_MMC_ARMMMCI=m
+CONFIG_MMC_DW=m
+# CONFIG_MMC_DW_IDMAC is not set
 
 CONFIG_RTC_DRV_PL030=m
 CONFIG_RTC_DRV_PL031=m
diff --git a/config-generic b/config-generic
index e00002e..e885bca 100644
--- a/config-generic
+++ b/config-generic
@@ -123,6 +123,7 @@ CONFIG_SDIO_UART=m
 # CONFIG_MMC_TEST is not set
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
+# CONFIG_MMC_CLKGATE is not set
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
@@ -564,6 +565,7 @@ CONFIG_SATA_SX4=m
 CONFIG_SATA_ULI=m
 CONFIG_SATA_VIA=m
 CONFIG_SATA_VITESSE=m
+CONFIG_SATA_ACARD_AHCI=m
 
 CONFIG_PATA_ACPI=m
 CONFIG_PATA_ALI=m
@@ -2211,6 +2213,8 @@ CONFIG_SENSORS_LTC4261=m
 # CONFIG_SENSORS_GPIO_FAN is not set
 CONFIG_SENSORS_W83795=m
 # CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_SHT21=m
 
 # CONFIG_HMC6352 is not set
 # CONFIG_BMP085 is not set
@@ -3061,10 +3065,12 @@ CONFIG_HID_THRUSTMASTER=m
 CONFIG_HID_ZEROPLUS=m
 CONFIG_HID_ZYDACRON=m
 CONFIG_HID_ACRUX_FF=m
+CONFIG_HID_EMS_FF=m
 CONFIG_HID_ELECOM=m
 CONFIG_HID_UCLOGIC=m
 CONFIG_HID_WALTOP=m
 CONFIG_HID_ROCCAT_PYRA=m
+CONFIG_HID_ROCCAT_KONEPLUS=m
 
 #
 # USB Imaging devices
@@ -3795,6 +3801,8 @@ CONFIG_ZLIB_DEFLATE=m
 
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_KEYS=y
+CONFIG_TRUSTED_KEYS=m
+CONFIG_ENCRYPTED_KEYS=m
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
@@ -4303,6 +4311,9 @@ CONFIG_USB_ATMEL=m
 # CONFIG_BCM_WIMAX is not set
 # CONFIG_FT1000 is not set
 # CONFIG_SPEAKUP is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
+# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 
 #
 # Android
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 1b05f4a..9cd30a4 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -335,4 +335,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 
 # CONFIG_PPC_MPC512x is not set
 
+CONFIG_MPC512X_DMA=m
+
 CONFIG_KVM_GUEST=y
diff --git a/config-powerpc64 b/config-powerpc64
index e2e8f99..74f33d1 100644
--- a/config-powerpc64
+++ b/config-powerpc64
@@ -182,3 +182,5 @@ CONFIG_PPC_SMLPAR=y
 CONFIG_CMM=y
 #-- DLPAR memory remove
 # CONFIG_SPARSEMEM_VMEMMAP is not set
+
+CONFIG_PSERIES_ENERGY=m
diff --git a/config-sparc64-generic b/config-sparc64-generic
index 61612cb..dac8a64 100644
--- a/config-sparc64-generic
+++ b/config-sparc64-generic
@@ -203,3 +203,7 @@ CONFIG_FB_XVR1000=y
 CONFIG_CRYPTO_DEV_NIAGARA2=y
 
 CONFIG_JUMP_LABEL=y
+
+# CONFIG_MTD_OF_PARTS is not set
+# CONFIG_MTD_PHYSMAP_OF is not set
+# CONFIG_MMC_SDHCI_OF is not set
diff --git a/config-x86-generic b/config-x86-generic
index eb8a16c..21f51ce 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -373,6 +373,7 @@ CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_PCIDEV_FRONTEND=m
 CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_BACKEND=y
 
 CONFIG_MTD_ESB2ROM=m
 CONFIG_MTD_CK804XROM=m
diff --git a/config-x86_64-generic b/config-x86_64-generic
index 11bf9c5..5ac06ca 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -305,6 +305,7 @@ CONFIG_XENFS=m
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_DEV_EVTCHN=m
 CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_BACKEND=y
 
 CONFIG_DMADEVICES=y
 CONFIG_INTEL_IOATDMA=m