summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-07-27 16:57:48 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-07-27 21:07:17 -0400
commit35ffdcd40ec0fe800421cd251f16a85be845c0e7 (patch)
tree99b8252ba790f60a326b34c622d73ae8d3413a22 /config-generic
parent4a2041744e262bb41936adfb3db0b85e13c73b11 (diff)
downloadkernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.tar.gz
kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.tar.xz
kernel-35ffdcd40ec0fe800421cd251f16a85be845c0e7.zip
3.0-git9 snapshot
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic14
1 files changed, 14 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 6a4cf325b..a9aea5738 100644
--- a/config-generic
+++ b/config-generic
@@ -734,6 +734,10 @@ CONFIG_FIREWIRE_NOSY=m
# CONFIG_I2O_LCT_NOTIFY_ON_CHANGES is not set
#
+# Virtualization support drivers
+#
+# CONFIG_VIRT_DRIVERS is not set
+
# Networking support
#
CONFIG_NET=y
@@ -2040,6 +2044,10 @@ CONFIG_INPUT_APPLEIR=m
# CONFIG_INPUT_AD714X is not set
# CONFIG_INPUT_PCF8574 is not set
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_MPU3050=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
#
# Character devices
@@ -2289,6 +2297,7 @@ CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_MAX6639=m
CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_ADS1015=m
CONFIG_SENSORS_MAX16065=m
CONFIG_SENSORS_MAX6642=m
@@ -2307,6 +2316,7 @@ CONFIG_SENSORS_MAX8688=m
# CONFIG_BMP085 is not set
# CONFIG_PCH_PHUB is not set
# CONFIG_SERIAL_PCH_UART is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
CONFIG_W1=m
CONFIG_W1_CON=y
@@ -3645,6 +3655,7 @@ CONFIG_SQUASHFS=m
CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZLIB=y
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_VXFS_FS=m
# CONFIG_HPFS_FS is not set
@@ -4193,6 +4204,7 @@ CONFIG_LEDS_CLASS=y
# CONFIG_LEDS_AMS_DELTA is not set
# CONFIG_LEDS_LOCOMO is not set
# CONFIG_LEDS_NET48XX is not set
+# CONFIG_LEDS_NET5501 is not set
# CONFIG_LEDS_PCA9532 is not set
# CONFIG_LEDS_PCA955X is not set
# CONFIG_LEDS_BD2802 is not set
@@ -4245,6 +4257,7 @@ CONFIG_FUNCTION_TRACER=y
CONFIG_STACK_TRACER=y
CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
CONFIG_OPTPROBES=y
# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
@@ -4657,6 +4670,7 @@ CONFIG_PN544_NFC=m
CONFIG_NFC_PN533=m
CONFIG_TARGET_CORE=m
+CONFIG_ISCSI_TARGET=m
CONFIG_LOOPBACK_TARGET=m
# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
CONFIG_TCM_IBLOCK=m