(temporary) fix for OLPC-XO build

[openwrt.git] / target / linux / generic-2.6 / config-2.6.25

diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 810b613..07a4895 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -593,7 +593,6 @@ CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m
-CONFIG_IP_NF_MATCH_IPRANGE=m
 CONFIG_NETFILTER_XT_MATCH_LAYER7=m
 # CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
 CONFIG_NETFILTER_XT_MATCH_TIME=m
@@ -898,6 +897,7 @@ CONFIG_NET_SCH_RR=m
 CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
+# CONFIG_ENC28J60 is not set
 # CONFIG_NET_TULIP is not set
 CONFIG_NET_WIRELESS=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
@@ -1029,6 +1029,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_MARVELL is not set
 # CONFIG_PATA_MPIIX is not set
 # CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_NS87415 is not set
 # CONFIG_PATA_OLDPIIX is not set
@@ -1149,6 +1150,7 @@ CONFIG_RTC_DRV_CMOS=y
 # CONFIG_RTC_DRV_DS1511 is not set
 # CONFIG_RTC_DRV_MAX6900 is not set
 # CONFIG_RTC_DRV_MAX6902 is not set
+# CONFIG_RTC_DRV_R9701 is not set
 # CONFIG_RTC_DRV_RS5C348 is not set
 # CONFIG_RTC_DRV_S35390A is not set
 # CONFIG_RTL8187 is not set
@@ -1388,6 +1390,7 @@ CONFIG_SND=m
 # CONFIG_SND_GUSEXTREME is not set
 # CONFIG_SND_GUSMAX is not set
 # CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HIFIER is not set
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
 CONFIG_SND_HWDEP=m
@@ -1420,6 +1423,7 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_PCM=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_OXYGEN is not set
 # CONFIG_SND_PCXHR is not set
 # CONFIG_SND_PDAUDIOCF is not set
 CONFIG_SND_RAWMIDI=m
@@ -1447,6 +1451,7 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VIA82XX is not set
 # CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_VXPOCKET is not set
 # CONFIG_SND_WAVEFRONT is not set
@@ -1646,6 +1651,7 @@ CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_IPAQ=m
 CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
 CONFIG_USB_SERIAL_IR=m
 CONFIG_USB_SERIAL_KEYSPAN=m
 CONFIG_USB_SERIAL_KEYSPAN_MPR=y
@@ -1682,6 +1688,7 @@ CONFIG_USB_SERIAL_XIRCOM=m
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_SN9C102 is not set
 CONFIG_USB_SPEEDTOUCH=m
+# CONFIG_USB_STKWEBCAM is not set
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_ALAUDA=y
 CONFIG_USB_STORAGE_DATAFAB=y
@@ -1726,6 +1733,7 @@ CONFIG_VFAT_FS=m
 # CONFIG_VIDEO_CAFE_CCIC is not set
 # CONFIG_VIDEO_CAPTURE_DRIVERS is not set
 # CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_CS5345 is not set
 # CONFIG_VIDEO_CS53L32A is not set
 # CONFIG_VIDEO_CX2341X is not set
 # CONFIG_VIDEO_CX25840 is not set
@@ -1738,6 +1746,7 @@ CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_HEXIUM_ORION is not set
 # CONFIG_VIDEO_IVTV is not set
 # CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_MXB is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1809,6 +1818,7 @@ CONFIG_WLAN_80211=y
 # CONFIG_X25 is not set
 CONFIG_XFRM=y
 # CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
 # CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_XFRM_USER=m
 CONFIG_XFS_FS=m