generic-2.6: resync 2.6.26 config

SVN-Revision: 12071

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 7e8eca428af62d030d737f22e6caa8f453a779b3..3cb0665c783f7600ed8cb68b63dfc7b1625d1ef2 100644 (file)
--- 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