summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2013-09-11 21:05:23 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2013-09-11 21:05:55 -0400
commit356f0cab41941c3a24ede9d1085296123fdc376e (patch)
tree1ebbfb08078d0ff516bb038f7c4650df46e895e2 /config-generic
parent5f27adc0d3e466cb2012002c6bfae342edd4704b (diff)
downloadkernel-356f0cab41941c3a24ede9d1085296123fdc376e.tar.gz
kernel-356f0cab41941c3a24ede9d1085296123fdc376e.tar.xz
kernel-356f0cab41941c3a24ede9d1085296123fdc376e.zip
Linux v3.11-9411-gc2d9572
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic7
1 files changed, 6 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 277e9f663..d20fc1a10 100644
--- a/config-generic
+++ b/config-generic
@@ -329,6 +329,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_CMDLINE_PARSER is not set
#
@@ -1333,7 +1334,7 @@ CONFIG_IXGBE_DCA=y
CONFIG_IXGBE_DCB=y
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_PTP=y
-
+CONFIG_I40E=m
# CONFIG_NET_VENDOR_I825XX is not set
CONFIG_NET_VENDOR_MARVELL=y
@@ -2611,6 +2612,7 @@ CONFIG_RTC_DRV_PCF50633=m
CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_ISL12022=m
# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
+# CONFIG_RTC_DRV_MOXART is not set
CONFIG_R3964=m
# CONFIG_APPLICOM is not set
@@ -3831,6 +3833,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -3969,6 +3972,7 @@ CONFIG_SUN_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
CONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
CONFIG_NLS=y
@@ -4577,6 +4581,7 @@ CONFIG_MEMSTICK=m
# CONFIG_MEMSTICK_DEBUG is not set
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
CONFIG_MEMSTICK_TIFM_MS=m
CONFIG_MEMSTICK_JMICRON_38X=m
CONFIG_MEMSTICK_R592=m