move some options to the generic 2.6.27 config

[openwrt/svn-archive/archive.git] / target / linux / olpc / config-2.6.27

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index a40cf3656819f9b3e5b1191825c8641fdc96e91d..31c2be535fa24ba2bb15a790d9ed84df331e1466 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -170,7 +170,6 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_ELF_CORE=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT3_FS is not set
-CONFIG_EXTRA_FIRMWARE=""
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FB=y
@@ -229,7 +228,6 @@ CONFIG_FB_GEODE_LX=y
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
 # CONFIG_FIRMWARE_EDID is not set
-CONFIG_FIRMWARE_IN_KERNEL=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FONTS is not set
@@ -239,7 +237,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
 # CONFIG_FRAME_POINTER is not set
-# CONFIG_FTRACE is not set
 CONFIG_GENERIC_BUG=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -254,7 +251,6 @@ CONFIG_GENERIC_ISA_DMA=y
 # CONFIG_GENERIC_LOCKBREAK is not set
 # CONFIG_GENERIC_TIME_VSYSCALL is not set
 CONFIG_GEODE_MFGPT_TIMER=y
-# CONFIG_GPIOLIB is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HANGCHECK_TIMER is not set
 CONFIG_HAS_DMA=y
@@ -665,7 +661,6 @@ CONFIG_VIDEO_SELECT=y
 CONFIG_VIDEO_V4L1=m
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
-# CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM86=y
 # CONFIG_VMSPLIT_1G is not set
 # CONFIG_VMSPLIT_2G is not set