aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Boyett <agb@openwrt.org>2008-08-02 03:19:56 +0000
committerAndy Boyett <agb@openwrt.org>2008-08-02 03:19:56 +0000
commit07780b323a721a8c22a7f406e6b12e53822d790f (patch)
tree42cae581c92bff18ac794cb90acc727ef582af1d
parentfb8ef5136262d1bd7a3fb1fe58d3634b929416cb (diff)
downloadupstream-07780b323a721a8c22a7f406e6b12e53822d790f.tar.gz
upstream-07780b323a721a8c22a7f406e6b12e53822d790f.tar.bz2
upstream-07780b323a721a8c22a7f406e6b12e53822d790f.zip
generic-2.6: resync 2.6.26 config
SVN-Revision: 12071
-rw-r--r--target/linux/generic-2.6/config-2.6.264
1 files changed, 4 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 7e8eca428a..3cb0665c78 100644
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -763,6 +763,7 @@ CONFIG_MISC_DEVICES=y
CONFIG_MKISS=m
# CONFIG_MMC is not set
# CONFIG_MMC_ARMMMCI is not set
+# CONFIG_MMC_TEST is not set
CONFIG_MMU=y
CONFIG_MODULES=y
# CONFIG_MODULE_FORCE_LOAD is not set
@@ -1489,6 +1490,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_WAVEFRONT is not set
# CONFIG_SND_YMFPCI is not set
# CONFIG_SNI_RM is not set
+# CONFIG_SOC_CAMERA is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
CONFIG_SOUND=m
# CONFIG_SOUND_PRIME is not set
@@ -1753,6 +1755,7 @@ CONFIG_USB_SUPPORT=y
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_USBNET=m
CONFIG_USB_USBNET_MII=m
+# CONFIG_USB_VIDEO_CLASS is not set
# CONFIG_USB_VICAM is not set
# CONFIG_USB_W9968CF is not set
# CONFIG_USB_WACOM is not set
@@ -1806,6 +1809,7 @@ CONFIG_VIDEO_DEV=m
# CONFIG_VIDEO_SAA711X is not set
# CONFIG_VIDEO_SAA7127 is not set
# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_SAA717X is not set
# CONFIG_VIDEO_SAA7185 is not set
# CONFIG_VIDEO_SAA7191 is not set
# CONFIG_VIDEO_STRADIS is not set