summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorKyle McMartin <kyle@mcmartin.ca>2010-11-02 13:06:42 -0400
committerKyle McMartin <kyle@mcmartin.ca>2010-11-02 13:06:42 -0400
commit7b2f649ec2da6640878c15298f5d3f8451dd8125 (patch)
treeb26440ffa8853847fa0625f932673c7ff2554f2c /config-x86-generic
parent3daa57b3d93c5d0a795e3446850c83483df37f2e (diff)
downloadkernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.gz
kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.tar.xz
kernel-7b2f649ec2da6640878c15298f5d3f8451dd8125.zip
Linux 2.6.37-rc1
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic6
1 files changed, 5 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index 8f19cd311..68bd39b2d 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -370,6 +370,7 @@ CONFIG_XEN_FBDEV_FRONTEND=y
CONFIG_XEN_KBDDEV_FRONTEND=y
CONFIG_XEN_BLKDEV_FRONTEND=m
CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
CONFIG_XENFS=m
CONFIG_XEN_COMPAT_XENFS=y
@@ -475,7 +476,7 @@ CONFIG_SBC_FITPC2_WATCHDOG=m
CONFIG_EDAC_I3200=m
CONFIG_EDAC_DECODE_MCE=m
-CONFIG_GPIO_LANGWELL=y
+# CONFIG_GPIO_LANGWELL is not set
# CONFIG_INTEL_TXT is not set
@@ -515,6 +516,7 @@ CONFIG_INTEL_IPS=m
CONFIG_OLPC_XO1=m
CONFIG_XO1_RFKILL=m
+CONFIG_VIDEO_VIA_CAMERA=m
CONFIG_EDAC_MCE_INJ=m
CONFIG_IRQ_TIME_ACCOUNTING=y
@@ -522,3 +524,5 @@ CONFIG_X86_RESERVE_LOW=64
CONFIG_PCH_GBE=m
CONFIG_PCH_PHUB=m
+
+CONFIG_JUMP_LABEL=y