[kernel] r15699 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Mon May 17 01:34:52 2010
New Revision: 15699

Log:
topconfig enable modular QLCNIC

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May 17 01:34:41 2010	(r15698)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 17 01:34:52 2010	(r15699)
@@ -6,7 +6,7 @@
   [ maximilian attems ]
   * topconfig enable IPV6_SIT_6RD, NETFILTER_XT_TARGET_CT, IP_VS_PROTO_SCTP,
     NF_CONNTRACK_ZONES, CAN_PLX_PCI, TI_DAC7512, SCSI_HPSA, PATA_TOSHIBA,
-    MACVTAP, CHELSIO_T4, IXGBEVF.
+    MACVTAP, CHELSIO_T4, IXGBEVF, QLCNIC.
   
   [ Ben Hutchings ]
   * Prepare debconf templates for translation (Closes: #576758)

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 17 01:34:41 2010	(r15698)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 17 01:34:52 2010	(r15699)
@@ -1480,6 +1480,7 @@
 CONFIG_MLX4_DEBUG=y
 CONFIG_TEHUTI=m
 CONFIG_BNX2X=m
+CONFIG_QLCNIC=m
 CONFIG_QLGE=m
 CONFIG_DEFXX=m
 # CONFIG_DEFXX_MMIO is not set