[kernel] r8275 - dists/trunk/linux-2.6/debian/patches/bugfix

[Bastian Blank]

Author: waldi
Date: Tue Feb  6 14:29:33 2007
New Revision: 8275

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
Log:
debian/patches/bugfix/drivers-bus_to_virt.patch: Revert to know working state.


Modified: dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch	Tue Feb  6 14:29:33 2007
@@ -1,7 +1,8 @@
-diff -ruN a/drivers/atm/Kconfig b/drivers/atm/Kconfig
---- a/drivers/atm/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/atm/Kconfig	2007-02-05 20:45:33.000000000 +0100
-@@ -139,7 +139,7 @@
+diff --git a/drivers/atm/Kconfig b/drivers/atm/Kconfig
+index 3368745..ed842ad 100644
+--- a/drivers/atm/Kconfig
++++ b/drivers/atm/Kconfig
+@@ -139,7 +139,7 @@ config ATM_ENI_BURST_RX_2W
  
  config ATM_FIRESTREAM
  	tristate "Fujitsu FireStream (FS50/FS155) "
@@ -10,7 +11,7 @@
  	help
  	  Driver for the Fujitsu FireStream 155 (MB86697) and
  	  FireStream 50 (MB86695) ATM PCI chips.
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ config ATM_FIRESTREAM
  
  config ATM_ZATM
  	tristate "ZeitNet ZN1221/ZN1225"
@@ -19,7 +20,7 @@
  	help
  	  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
  	  adapters.
-@@ -237,7 +237,7 @@
+@@ -237,7 +237,7 @@ config ATM_IDT77252_USE_SUNI
  
  config ATM_AMBASSADOR
  	tristate "Madge Ambassador (Collage PCI 155 Server)"
@@ -28,7 +29,7 @@
  	select BITREVERSE
  	help
  	  This is a driver for ATMizer based ATM card produced by Madge
-@@ -262,7 +262,7 @@
+@@ -262,7 +262,7 @@ config ATM_AMBASSADOR_DEBUG
  
  config ATM_HORIZON
  	tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
@@ -37,10 +38,11 @@
  	help
  	  This is a driver for the Horizon chipset ATM adapter cards once
  	  produced by Madge Networks Ltd. Say Y (or M to compile as a module
-diff -ruN a/drivers/block/Kconfig b/drivers/block/Kconfig
---- a/drivers/block/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/block/Kconfig	2007-02-05 20:45:33.000000000 +0100
-@@ -141,7 +141,7 @@
+diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
+index 58c1deb..4067086 100644
+--- a/drivers/block/Kconfig
++++ b/drivers/block/Kconfig
+@@ -141,7 +141,7 @@ source "drivers/block/paride/Kconfig"
  
  config BLK_CPQ_DA
  	tristate "Compaq SMART2 support"
@@ -49,10 +51,11 @@
  	help
  	  This is the driver for Compaq Smart Array controllers.  Everyone
  	  using these boards should say Y here.  See the file
-diff -ruN a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
---- a/drivers/message/i2o/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/message/i2o/Kconfig	2007-02-05 20:45:33.000000000 +0100
-@@ -56,7 +56,7 @@
+diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
+index 6443392..dee6e54 100644
+--- a/drivers/message/i2o/Kconfig
++++ b/drivers/message/i2o/Kconfig
+@@ -56,7 +56,7 @@ config I2O_EXT_ADAPTEC_DMA64
  
  config I2O_CONFIG
  	tristate "I2O Configuration support"
@@ -61,22 +64,24 @@
  	---help---
  	  Say Y for support of the configuration interface for the I2O adapters.
  	  If you have a RAID controller from Adaptec and you want to use the
-diff -ruN a/drivers/net/Kconfig b/drivers/net/Kconfig
---- a/drivers/net/Kconfig	2007-02-05 20:44:50.000000000 +0100
-+++ b/drivers/net/Kconfig	2007-02-05 20:45:33.000000000 +0100
-@@ -1469,7 +1469,7 @@
+diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
+index 8aa8dd0..9f65883 100644
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -1469,7 +1469,7 @@ config CS89x0
  
  config TC35815
  	tristate "TOSHIBA TC35815 Ethernet support"
 -	depends on NET_PCI && PCI && TOSHIBA_JMR3927
 +	depends on NET_PCI && PCI && TOSHIBA_JMR3927 && !PPC64
  
- config EEPRO100
- 	tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
-diff -ruN a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
---- a/drivers/net/wan/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/net/wan/Kconfig	2007-02-05 20:45:33.000000000 +0100
-@@ -62,7 +62,7 @@
+ config DGRS
+ 	tristate "Digi Intl. RightSwitch SE-X support"
+diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
+index 21f76f5..14799d6 100644
+--- a/drivers/net/wan/Kconfig
++++ b/drivers/net/wan/Kconfig
+@@ -62,7 +62,7 @@ config COSA
  #
  config LANMEDIA
  	tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
@@ -85,10 +90,11 @@
  	---help---
  	  Driver for the following Lan Media family of serial boards:
  
-diff -ruN a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
---- a/drivers/scsi/Kconfig	2007-02-04 19:44:54.000000000 +0100
-+++ b/drivers/scsi/Kconfig	2007-02-05 20:45:33.000000000 +0100
-@@ -532,7 +532,7 @@
+diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
+index 60f5827..96b1e8a 100644
+--- a/drivers/scsi/Kconfig
++++ b/drivers/scsi/Kconfig
+@@ -532,7 +532,7 @@ config SCSI_HPTIOP
  
  config SCSI_BUSLOGIC
  	tristate "BusLogic SCSI support"
@@ -97,7 +103,7 @@
  	---help---
  	  This is support for BusLogic MultiMaster and FlashPoint SCSI Host
  	  Adapters. Consult the SCSI-HOWTO, available from
-@@ -1364,7 +1364,7 @@
+@@ -1364,7 +1364,7 @@ config SCSI_DC395x
  
  config SCSI_DC390T
  	tristate "Tekram DC390(T) and Am53/79C974 SCSI support"