[kernel] r11606 - in dists/trunk/linux-modules-contrib-2.6: . debian em8300

[Daniel Baumann]

Author: daniel
Date: Tue Jun 10 20:54:40 2008
New Revision: 11606

Log:
Re-enabling em8300 on all but xen flavours.

Modified:
   dists/trunk/linux-modules-contrib-2.6/debian/changelog
   dists/trunk/linux-modules-contrib-2.6/defines
   dists/trunk/linux-modules-contrib-2.6/em8300/defines

Modified: dists/trunk/linux-modules-contrib-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/changelog	(original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/changelog	Tue Jun 10 20:54:40 2008
@@ -1,7 +1,7 @@
 linux-modules-contrib-2.6 (2.6.25-1) unstable; urgency=low
 
   * Updating to 2.6.25-2.
-  * Disabling em8300, fails to build with 2.6.25.
+  * Disabling em8300 on xen flavours.
 
  -- Daniel Baumann <daniel at debian.org>  Fri, 16 May 2008 12:04:00 +0200
 

Modified: dists/trunk/linux-modules-contrib-2.6/defines
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/defines	(original)
+++ dists/trunk/linux-modules-contrib-2.6/defines	Tue Jun 10 20:54:40 2008
@@ -1,3 +1,4 @@
 [base]
 modules:
+ em8300
  rt73

Modified: dists/trunk/linux-modules-contrib-2.6/em8300/defines
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/em8300/defines	(original)
+++ dists/trunk/linux-modules-contrib-2.6/em8300/defines	Tue Jun 10 20:54:40 2008
@@ -1,4 +1,5 @@
 [base]
+not-featuresets: xen xen-vserver
 desc: Driver for the DXR3/Hollywood+ decoder cards
 longdesc:
  Drivers for MPEG decoder cards based on Sigma Designs' EM8300 chip (such as the