X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel-2.6.22-i586-planetlab.config;h=7202d767f293dcc84ae2519b55c0bdb37d7ade94;hb=refs%2Fheads%2Ftrellis-sapan;hp=1cb37495d8b757ac504778804048e41938fc5c10;hpb=0df16a3a34bc4dc8222828dd0df9ae070fa991fd;p=linux-2.6.git

diff --git a/kernel-2.6.22-i586-planetlab.config b/kernel-2.6.22-i586-planetlab.config
index 1cb37495d..7202d767f 100644
--- a/kernel-2.6.22-i586-planetlab.config
+++ b/kernel-2.6.22-i586-planetlab.config
@@ -291,7 +291,7 @@ CONFIG_PCI=y
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_MMCONFIG is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIEAER=y
 CONFIG_ARCH_SUPPORTS_MSI=y
@@ -950,7 +950,7 @@ CONFIG_PATA_PDC_OLD=m
 CONFIG_PATA_QDI=m
 CONFIG_PATA_RADISYS=m
 CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
+# CONFIG_PATA_SC1200 is not set
 CONFIG_PATA_SERVERWORKS=m
 CONFIG_PATA_PDC2027X=m
 CONFIG_PATA_SIL680=m
@@ -977,7 +977,7 @@ CONFIG_MD_RAID456=m
 CONFIG_MD_RAID5_RESHAPE=y
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
+CONFIG_BLK_DEV_DM=y
 CONFIG_DM_DEBUG=y
 CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
@@ -1135,6 +1135,7 @@ CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+CONFIG_E1000E=m
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -2060,7 +2061,7 @@ CONFIG_DOUBLEFAULT=y
 # Linux VServer
 #
 CONFIG_VSERVER_FILESHARING=y
-CONFIG_VSERVER_AUTO_LBACK=y
+# CONFIG_VSERVER_AUTO_LBACK is not set
 # CONFIG_VSERVER_AUTO_SINGLE is not set
 CONFIG_VSERVER_COWBL=y
 # CONFIG_VSERVER_VTIME is not set