[kernel] r12121 - in dists/trunk/linux-modules-extra-2.6: debian et131x

[Bastian Blank]

Author: waldi
Date: Thu Aug 21 11:27:15 2008
New Revision: 12121

Log:
* debian/changelog: Update, unrelease.
* et131x/defines: Disable on vserver.


Modified:
   dists/trunk/linux-modules-extra-2.6/debian/changelog
   dists/trunk/linux-modules-extra-2.6/et131x/defines

Modified: dists/trunk/linux-modules-extra-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/debian/changelog	(original)
+++ dists/trunk/linux-modules-extra-2.6/debian/changelog	Thu Aug 21 11:27:15 2008
@@ -1,7 +1,8 @@
-linux-modules-extra-2.6 (2.6.26-3) unstable; urgency=low
+linux-modules-extra-2.6 (2.6.26-3) UNRELEASED; urgency=low
 
   * Reenable aufs always.
   * Build against verion 2.6.26-3 (add VServer images).
+  * Disable et131x on vserver featureset, see #495918.
 
  -- Bastian Blank <waldi at debian.org>  Thu, 21 Aug 2008 11:06:07 +0200
 

Modified: dists/trunk/linux-modules-extra-2.6/et131x/defines
==============================================================================
--- dists/trunk/linux-modules-extra-2.6/et131x/defines	(original)
+++ dists/trunk/linux-modules-extra-2.6/et131x/defines	Thu Aug 21 11:27:15 2008
@@ -1,7 +1,7 @@
 [base]
-# Needs PCI
+# Needs PCI, Bug#495918
 not-arches: m68k s390
-not-featuresets: xen 
+not-featuresets: vserver xen 
 not-flavours: r4k-ip22
 desc: et131x Ethernet Adapter driver
 longdesc: