summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-08-27 17:57:25 -0400
committerDave Jones <davej@redhat.com>2011-08-27 17:57:25 -0400
commitccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0 (patch)
tree997b2cddbdb6025330816ef5a04656e56346fd23 /config-generic
parentc62acbf43a28550deac0866008fb33a151801304 (diff)
downloadkernel-ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0.tar.gz
kernel-ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0.tar.xz
kernel-ccdeeb8a3a45f6d0ebac9bfa359b1d9c848cd0d0.zip
fix up some config warnings
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic6
1 files changed, 1 insertions, 5 deletions
diff --git a/config-generic b/config-generic
index e37094a4d..91ddd6868 100644
--- a/config-generic
+++ b/config-generic
@@ -2892,10 +2892,7 @@ CONFIG_FB_VIA=m
CONFIG_FB_VIA_X_COMPATIBILITY=y
# CONFIG_FB_VIA_DIRECT_PROCFS is not set
CONFIG_FB_METRONOME=m
-CONFIG_FB_MB862XX=m
-CONFIG_FB_MB862XX_PCI_GDC=y
-CONFIG_FB_MB862XX_LIME=y
-CONFIG_FB_MB862XX_I2C=y
+# CONFIG_FB_MB862XX is not set
# CONFIG_FB_PRE_INIT_FB is not set
# CONFIG_FB_TMIO is not set
# CONFIG_FB_BROADSHEET is not set
@@ -4617,7 +4614,6 @@ CONFIG_LOCKUP_DETECTOR=y
# CONFIG_DEBUG_INFO_REDUCED is not set
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_MEMORY_FAILURE=y