Author: waldi
Date: Thu Jan 11 16:19:11 2007
New Revision: 8163
Modified:
dists/trunk/linux-2.6/debian/patches/bugfix/drivers-bus_to_virt.patch
Log:
debian/patches/bugfix/drivers-bus_to_virt.patch: Reduce to only exclude PPC64.
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
Thu Jan 11 16:19:11 2007
@@ -7,7 +7,7 @@
config ATM_FIRESTREAM
tristate "Fujitsu FireStream (FS50/FS155) "
- depends on PCI && ATM
-+ depends on PCI && ATM && !64BIT
++ depends on PCI && ATM && !PPC64
help
Driver for the Fujitsu FireStream 155 (MB86697) and
FireStream 50 (MB86695) ATM PCI chips.
@@ -16,7 +16,7 @@
config ATM_ZATM
tristate "ZeitNet ZN1221/ZN1225"
- depends on PCI && ATM
-+ depends on PCI && ATM && !64BIT
++ depends on PCI && ATM && !PPC64
help
Driver for the ZeitNet ZN1221 (MMF) and ZN1225 (UTP-5) 155 Mbps ATM
adapters.
@@ -25,7 +25,7 @@
config ATM_AMBASSADOR
tristate "Madge Ambassador (Collage PCI 155 Server)"
- depends on PCI && ATM
-+ depends on PCI && ATM && !64BIT
++ depends on PCI && ATM && !PPC64
select BITREVERSE
help
This is a driver for ATMizer based ATM card produced by Madge
@@ -34,7 +34,7 @@
config ATM_HORIZON
tristate "Madge Horizon [Ultra] (Collage PCI 25 and Collage PCI 155
Client)"
- depends on PCI && ATM
-+ depends on PCI && ATM && !64BIT
++ depends on PCI && ATM && !PPC64
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
@@ -51,19 +51,6 @@
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
@@ -73,7 +60,7 @@
config I2O_CONFIG
tristate "I2O Configuration support"
- depends on I2O
-+ depends on I2O && !64BIT
++ depends on I2O && !PPC64
---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
@@ -86,7 +73,7 @@
config TC35815
tristate "TOSHIBA TC35815 Ethernet support"
- depends on NET_PCI && PCI && TOSHIBA_JMR3927
-+ depends on NET_PCI && PCI && TOSHIBA_JMR3927 && !64BIT
++ depends on NET_PCI && PCI && TOSHIBA_JMR3927 && !PPC64
config DGRS
tristate "Digi Intl. RightSwitch SE-X support"
@@ -99,7 +86,7 @@
config LANMEDIA
tristate "LanMedia Corp. SSI/V.35, T1/E1, HSSI, T3 boards"
- depends on WAN && PCI
-+ depends on WAN && PCI && !64BIT
++ depends on WAN && PCI && !PPC64
---help---
Driver for the following Lan Media family of serial boards:
@@ -107,21 +94,12 @@
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
++ depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API && !PPC64
---help---
This is support for BusLogic MultiMaster and FlashPoint SCSI Host
Adapters. Consult the SCSI-HOWTO, available from
@@ -130,7 +108,7 @@
config SCSI_DC390T
tristate "Tekram DC390(T) and Am53/79C974 SCSI support"
- depends on PCI && SCSI
-+ depends on PCI && SCSI && !64BIT
++ depends on PCI && SCSI && !PPC64
---help---
This driver supports PCI SCSI host adapters based on the Am53C974A
chip, e.g. Tekram DC390(T), DawiControl 2974 and some onboard
_______________________________________________
Kernel-svn-changes mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
