summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-20 08:13:48 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-20 08:13:48 -0400
commit0ad3713581707dc6d4d25ab7d148a37b654cff48 (patch)
treeef85a4fc962a97739da2aee14a164180cc775178 /config-generic
parent7aac3ebb1e0cc675b2cbc54fcc1f98dd73c011b9 (diff)
downloadkernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.tar.gz
kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.tar.xz
kernel-0ad3713581707dc6d4d25ab7d148a37b654cff48.zip
3.1-rc2-git7 snapshot. Fix provides/obsoletes for cpupowerutils-devel
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 443b2c114..38e09006b 100644
--- a/config-generic
+++ b/config-generic
@@ -359,6 +359,7 @@ CONFIG_CISS_SCSI_TAPE=y
CONFIG_BLK_DEV_DAC960=m
CONFIG_BLK_DEV_UMEM=m
CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_OSD=m
@@ -375,6 +376,7 @@ CONFIG_BLK_DEV_DELKIN=m
# CONFIG_BLK_DEV_TC86C001 is not set
CONFIG_LBDAF=y
CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
CONFIG_BLK_DEV_THROTTLING=y