summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-11-07 11:25:51 -0500
committerJosh Boyer <jwboyer@redhat.com>2011-11-07 11:25:51 -0500
commitea8a97de392f5812bf340e217ae7907762c94917 (patch)
treed7d8c79e5ecf4d0502918f2825b3e2121acb0e6c /config-generic
parent05e763b50e0db1ef9c00a211e3c6a92f5032190a (diff)
downloadkernel-ea8a97de392f5812bf340e217ae7907762c94917.tar.gz
kernel-ea8a97de392f5812bf340e217ae7907762c94917.tar.xz
kernel-ea8a97de392f5812bf340e217ae7907762c94917.zip
Linux 3.1-git7 (upstream 31555213f)
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-generic b/config-generic
index 9ae4301fb..683bd1f01 100644
--- a/config-generic
+++ b/config-generic
@@ -3698,6 +3698,7 @@ CONFIG_SQUASHFS_XATTR=y
CONFIG_SQUASHFS_LZO=y
CONFIG_SQUASHFS_XZ=y
CONFIG_SQUASHFS_ZLIB=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
# CONFIG_SQUASHFS_EMBEDDED is not set
CONFIG_VXFS_FS=m
# CONFIG_HPFS_FS is not set
@@ -4433,6 +4434,7 @@ CONFIG_UWB_WHCI=m
CONFIG_UWB_I1480U=m
CONFIG_STAGING=y
+# CONFIG_STAGING_MEDIA is not set
# CONFIG_ET131X is not set
# CONFIG_SLICOSS is not set
# CONFIG_WLAGS49_H2 is not set