diff options
author | Josh Boyer <jwboyer@redhat.com> | 2011-10-31 15:20:40 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2011-10-31 15:20:40 -0400 |
commit | 8e04ce5a387af9a033773520fa7c07b705e081c6 (patch) | |
tree | 5c7669fe0426c9b373df7101967fbecaeeb60f40 /config-generic | |
parent | dff08547967b51d0c1a79626647971c508e4106e (diff) | |
download | kernel-8e04ce5a387af9a033773520fa7c07b705e081c6.tar.gz kernel-8e04ce5a387af9a033773520fa7c07b705e081c6.tar.xz kernel-8e04ce5a387af9a033773520fa7c07b705e081c6.zip |
Linux 3.1-git3. Happy Halloween.
Diffstat (limited to 'config-generic')
-rw-r--r-- | config-generic | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config-generic b/config-generic index f9446441f..6ec1960f7 100644 --- a/config-generic +++ b/config-generic @@ -89,6 +89,8 @@ CONFIG_PCI=y # CONFIG_PCI_DEBUG is not set CONFIG_PCI_STUB=y CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y CONFIG_HT_IRQ=y CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y @@ -528,6 +530,8 @@ CONFIG_SCSI_MPT2SAS=m CONFIG_SCSI_MPT2SAS_MAX_SGE=128 CONFIG_SCSI_MPT2SAS_LOGGING=y +CONFIG_SCSI_MVUMI=m + CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_OSD_DPRINT_SENSE=1 @@ -2917,6 +2921,7 @@ CONFIG_FB_SAVAGE_ACCEL=y CONFIG_FB_SIS_300=y CONFIG_FB_SIS_315=y CONFIG_FB_SM501=m +CONFIG_FB_SMSCUFX=m CONFIG_FB_TILEBLITTING=y CONFIG_FB_TRIDENT=m # CONFIG_FB_UVESA is not set @@ -3604,6 +3609,7 @@ CONFIG_LOGFS=m CONFIG_CEPH_FS=m CONFIG_BLK_DEV_RBD=m CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set CONFIG_FSCACHE=m CONFIG_FSCACHE_STATS=y |