prepare for the removal of squashfs 3.4: switch olpc to 2.6.30 (let's hope it works...

[openwrt.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 2800b77..c3ad33a 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -54,7 +54,6 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
 # CONFIG_BACKLIGHT_PROGEAR is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 CONFIG_BASE_SMALL=0
-# CONFIG_BATTERY_DS2760 is not set
 CONFIG_BATTERY_OLPC=y
 # CONFIG_BINFMT_AOUT is not set
 CONFIG_BINFMT_MISC=y
@@ -69,7 +68,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOUNCE=y
 CONFIG_CAN_PM_TRACE=y
-CONFIG_CFG80211=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
@@ -139,60 +137,13 @@ CONFIG_EXT2_FS=y
 CONFIG_FAST_CMPXCHG_LOCAL=y
 # CONFIG_FAULT_INJECTION is not set
 CONFIG_FB=y
-# CONFIG_FB_3DFX is not set
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_ATY is not set
-# CONFIG_FB_ATY128 is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_CARMINE is not set
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_CIRRUS is not set
-# CONFIG_FB_CYBER2000 is not set
-# CONFIG_FB_CYBLA is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_EFI is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_GEODE=y
 # CONFIG_FB_GEODE_GX is not set
 # CONFIG_FB_GEODE_GX1 is not set
 CONFIG_FB_GEODE_LX=y
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_I810 is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_INTEL is not set
-# CONFIG_FB_KYRO is not set
-# CONFIG_FB_LE80578 is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_MATROX is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_NEOMAGIC is not set
-# CONFIG_FB_NVIDIA is not set
-# CONFIG_FB_PM2 is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_RADEON is not set
-# CONFIG_FB_RIVA is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_S3 is not set
-# CONFIG_FB_SAVAGE is not set
-# CONFIG_FB_SIS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_TILEBLITTING is not set
-# CONFIG_FB_TRIDENT is not set
-# CONFIG_FB_VESA is not set
-# CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_VOODOO1 is not set
-# CONFIG_FB_VT8623 is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_FIX_EARLYCON_MEM=y
@@ -265,8 +216,6 @@ CONFIG_I2C_BOARDINFO=y
 # CONFIG_IDE is not set
 # CONFIG_IEEE80211 is not set
 # CONFIG_IFB is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
 # CONFIG_INET_AH is not set
 # CONFIG_INET_ESP is not set
 # CONFIG_INET_IPCOMP is not set
@@ -364,13 +313,7 @@ CONFIG_MICROCODE_OLD_INTERFACE=y
 # CONFIG_MK8 is not set
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_MMC_DEBUG is not set
 CONFIG_MMC_SDHCI=y
-# CONFIG_MMC_SDHCI_PCI is not set
-# CONFIG_MMC_TIFM_SD is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_WBSD is not set
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MOUSE_BCM5974 is not set
 CONFIG_MOUSE_PS2=y
@@ -441,7 +384,6 @@ CONFIG_MTD_PCI=y
 # CONFIG_NF_NAT_PPTP is not set
 # CONFIG_NF_NAT_SIP is not set
 # CONFIG_NF_NAT_SNMP_BASIC is not set
-CONFIG_NL80211=y
 # CONFIG_NLS is not set
 CONFIG_NOHIGHMEM=y
 CONFIG_NO_HZ=y
@@ -490,7 +432,6 @@ CONFIG_PROFILING=y
 # CONFIG_RCU_TORTURE_TEST is not set
 CONFIG_RELAY=y
 # CONFIG_RELOCATABLE is not set
-# CONFIG_RFKILL is not set
 CONFIG_RTC=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
@@ -527,10 +468,7 @@ CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_INTEL is not set
 # CONFIG_SND_HDA_POWER_SAVE is not set
-# CONFIG_SND_MIXER_OSS is not set
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCSP is not set
-# CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_VMASTER=y
 # CONFIG_SONYPI is not set
@@ -544,7 +482,6 @@ CONFIG_THERMAL=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TIMER_STATS=y
 # CONFIG_TOSHIBA is not set
-# CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
 CONFIG_UID16=y
 CONFIG_USB=y
@@ -567,8 +504,6 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_SUSPEND=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_USBNET is not set
-# CONFIG_USB_VIDEO_CLASS is not set
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_V4L_USB_DRIVERS=y
 # CONFIG_VFAT_FS is not set
 CONFIG_VGACON_SOFT_SCROLLBACK=y