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

Thu Jan 11 14:42:45 CET 2007

Author: waldi
Date: Thu Jan 11 14:42:45 2007
New Revision: 8161

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


Added: dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
==============================================================================

--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch	Thu Jan 11 14:42:45 2007
@@ -0,0 +1,136 @@
+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) "
+-	depends on PCI && ATM
++	depends on PCI && ATM && !64BIT
+ 	help
+ 	  Driver for the Fujitsu FireStream 155 (MB86697) and
+ 	  FireStream 50 (MB86695) ATM PCI chips.
+@@ -149,7 +149,7 @@ config ATM_FIRESTREAM
+ 
+ config ATM_ZATM
+ 	tristate "ZeitNet ZN1221/ZN1225"
+-	depends on PCI && ATM
++	depends on PCI && ATM && !64BIT
+ 	help
+ 	  Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
+ 	  adapters.
+@@ -237,7 +237,7 @@ config ATM_IDT77252_USE_SUNI
+ 
+ config ATM_AMBASSADOR
+ 	tristate "Madge Ambassador (Collage PCI 155 Server)"
+-	depends on PCI && ATM
++	depends on PCI && ATM && !64BIT
+ 	select BITREVERSE
+ 	help
+ 	  This is a driver for ATMizer based ATM card produced by Madge
+@@ -262,7 +262,7 @@ config ATM_AMBASSADOR_DEBUG
+ 
+ config ATM_HORIZON
+ 	tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155 Client)"
+-	depends on PCI && ATM
++	depends on PCI && ATM && !64BIT
+ 	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"
+ 
+ config BLK_CPQ_DA
+ 	tristate "Compaq SMART2 support"
+-	depends on PCI
++	depends on PCI && X86_32
+ 	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/media/video/Kconfig b/drivers/media/video/Kconfig
+index 57357db..1d292e7 100644
+--- a/drivers/media/video/Kconfig
++++ b/drivers/media/video/Kconfig
+@@ -506,7 +506,7 @@ config VIDEO_ZORAN_ZR36060
+ 
+ config VIDEO_ZORAN
+ 	tristate "Zoran ZR36057/36067 Video For Linux"
+-	depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !PPC64
++	depends on PCI && I2C_ALGOBIT && VIDEO_V4L1 && !64BIT
+ 	help
+ 	  Say Y for support for MJPEG capture cards based on the Zoran
+ 	  36057/36067 PCI controller chipset. This includes the Iomega
+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"
+-	depends on I2O
++	depends on I2O && !64BIT
+ 	---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
+ 
+ config TC35815
+ 	tristate "TOSHIBA TC35815 Ethernet support"
+-	depends on NET_PCI && PCI && TOSHIBA_JMR3927
++	depends on NET_PCI && PCI && TOSHIBA_JMR3927 && !64BIT
+ 
+ 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"
+-	depends on WAN && PCI
++	depends on WAN && PCI && !64BIT
+ 	---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
+@@ -470,7 +470,7 @@ source "drivers/scsi/aic94xx/Kconfig"
+ # All the I2O code and drivers do not seem to be 64bit safe.
+ config SCSI_DPT_I2O
+ 	tristate "Adaptec I2O RAID support "
+-	depends on !64BIT && SCSI && PCI
++	depends on !64BIT && SCSI && PCI && !64BIT
+ 	help
+ 	  This driver supports all of Adaptec's I2O based RAID controllers as 
+ 	  well as the DPT SmartRaid V cards.  This is an Adaptec maintained
+@@ -532,7 +532,7 @@ config SCSI_HPTIOP
+ 
+ config SCSI_BUSLOGIC
+ 	tristate "BusLogic SCSI support"
+-	depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
++	depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API && !64BIT
+ 	---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
+ 
+ config SCSI_DC390T
+ 	tristate "Tekram DC390(T) and Am53/79C974 SCSI support"
+-	depends on PCI && SCSI
++	depends on PCI && SCSI && !64BIT
+ 	---help---
+ 	  This driver supports PCI SCSI host adapters based on the Am53C974A
+ 	  chip, e.g. Tekram DC390(T), DawiControl 2974 and some onboard

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	Thu Jan 11 14:42:45 2007
@@ -25,3 +25,4 @@
 + features/arm/ixp4xx_npe_driver-0.3.1.patch
 + features/arm/ixp4xx-net-driver-improve-mac-handling.patch
 + bugfix/Makefile-localversion-backup.patch
++ bugfix/drivers-bus_to_virt.patch

