[kernel] r8285 - in dists/trunk/linux-2.6/debian/patches: bugfix/powerpc bugfix/sparc series

[Bastian Blank]

Author: waldi
Date: Wed Feb  7 14:16:45 2007
New Revision: 8285

Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/drivers_macintosh-broken.patch   (contents, props changed)
   dists/trunk/linux-2.6/debian/patches/bugfix/sparc/drivers_net-broken.patch   (contents, props changed)
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
* debian/patches/bugfix/powerpc/drivers_macintosh-broken.patch,
  debian/patches/bugfix/sparc/drivers_net-broken.patch: Add.
* debian/patches/series/1~experimental.1: Update.


Added: dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/drivers_macintosh-broken.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/powerpc/drivers_macintosh-broken.patch	Wed Feb  7 14:16:45 2007
@@ -0,0 +1,12 @@
+diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig
+index a9e747c..9e02447 100644
+--- a/drivers/macintosh/Kconfig
++++ b/drivers/macintosh/Kconfig
+@@ -1,6 +1,6 @@
+ 
+ menu "Macintosh device drivers"
+-	depends on PPC || MAC
++	depends on PPC_MAC || PPC_CHRP || MAC
+ 
+ config ADB
+ 	bool "Apple Desktop Bus (ADB) support"

Added: dists/trunk/linux-2.6/debian/patches/bugfix/sparc/drivers_net-broken.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/sparc/drivers_net-broken.patch	Wed Feb  7 14:16:45 2007
@@ -0,0 +1,13 @@
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 8aa8dd0..f3b61ce 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2484,7 +2484,7 @@ config MYRI10GE
+ 
+ config NETXEN_NIC
+ 	tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
+-	depends on PCI
++	depends on PCI && (!SPARC32 || BROKEN)
+ 	help
+ 	  This enables the support for NetXen's Gigabit Ethernet card.
+ 

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Feb  7 14:16:45 2007
@@ -32,3 +32,5 @@
 + bugfix/arm/n2100-r8169-parity.patch
 + features/alpha/alpha-prctl.patch
 + bugfix/alpha/asm-subarchs.patch
++ bugfix/powerpc/drivers_macintosh-broken.patch
++ bugfix/sparc/drivers_net-broken.patch