[kernel] r8269 - in dists/trunk/linux-2.6/debian/patches: bugfix series

[Frederik Schüler]

Author: fs
Date: Mon Feb  5 20:50:51 2007
New Revision: 8269

Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
Log:
rediff drivers-bus_to_virt.patch


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	Mon Feb  5 20:50:51 2007
@@ -1,8 +1,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
+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 @@
  
  config ATM_FIRESTREAM
  	tristate "Fujitsu FireStream (FS50/FS155) "
@@ -11,7 +10,7 @@
  	help
  	  Driver for the Fujitsu FireStream 155 (MB86697) and
  	  FireStream 50 (MB86695) ATM PCI chips.
-@@ -149,7 +149,7 @@ config ATM_FIRESTREAM
+@@ -149,7 +149,7 @@
  
  config ATM_ZATM
  	tristate "ZeitNet ZN1221/ZN1225"
@@ -20,7 +19,7 @@
  	help
  	  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
  	  adapters.
-@@ -237,7 +237,7 @@ config ATM_IDT77252_USE_SUNI
+@@ -237,7 +237,7 @@
  
  config ATM_AMBASSADOR
  	tristate "Madge Ambassador (Collage PCI 155 Server)"
@@ -29,7 +28,7 @@
  	select BITREVERSE
  	help
  	  This is a driver for ATMizer based ATM card produced by Madge
-@@ -262,7 +262,7 @@ config ATM_AMBASSADOR_DEBUG
+@@ -262,7 +262,7 @@
  
  config ATM_HORIZON
  	tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
@@ -38,11 +37,10 @@
  	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 --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"
+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 @@
  
  config BLK_CPQ_DA
  	tristate "Compaq SMART2 support"
@@ -51,11 +49,10 @@
  	help
  	  This is the driver for Compaq Smart Array controllers.  Everyone
  	  using these boards should say Y here.  See the file
-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
+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 @@
  
  config I2O_CONFIG
  	tristate "I2O Configuration support"
@@ -64,24 +61,22 @@
  	---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 --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
+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 @@
  
  config TC35815
  	tristate "TOSHIBA TC35815 Ethernet support"
 -	depends on NET_PCI && PCI && TOSHIBA_JMR3927
 +	depends on NET_PCI && PCI && TOSHIBA_JMR3927 && !PPC64
  
- 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 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 LANMEDIA
  	tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
@@ -90,11 +85,10 @@
  	---help---
  	  Driver for the following Lan Media family of serial boards:
  
-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
+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 @@
  
  config SCSI_BUSLOGIC
  	tristate "BusLogic SCSI support"
@@ -103,7 +97,7 @@
  	---help---
  	  This is support for BusLogic MultiMaster and FlashPoint SCSI Host
  	  Adapters. Consult the SCSI-HOWTO, available from
-@@ -1364,7 +1364,7 @@ config SCSI_DC395x
+@@ -1364,7 +1364,7 @@
  
  config SCSI_DC390T
  	tristate "Tekram DC390(T) and Am53/79C974 SCSI support"

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	Mon Feb  5 20:50:51 2007
@@ -25,7 +25,7 @@
 + features/arm/ixp4xx_npe_driver-0.3.1.patch
 + features/arm/ixp4xx-net-driver-improve-mac-handling.patch
 + bugfix/Makefile-localversion-backup.patch
-#FIXME + bugfix/drivers-bus_to_virt.patch
++ bugfix/drivers-bus_to_virt.patch
 + bugfix/arm/disable-broken-config-options.patch
 + bugfix/arm/cyber2010_burst.patch
 + bugfix/arm/rtc-rs5c372-n2100.patch