debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Disable broken config options on ARM - thanks Gordon 

svn path=/dists/trunk/linux-2.6/; revision=8263
This commit is contained in:
Martin Michlmayr 2007-02-05 11:43:56 +00:00
parent d3b39c3961
commit adcf8a1cad
3 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -26,6 +26,9 @@ linux-2.6 (2.6.20-1~experimental.1) UNRELEASED; urgency=low
[ maximilian attems ]
* i386: Enable kvm.
[ Gordon Farquharson ]
* Disable broken config options on ARM.
-- maximilian attems <maks@sternwelten.at> Tue, 30 Jan 2007 09:32:00 +0100
linux-2.6 (2.6.18.dfsg.1-9) unstable; urgency=low

78
debian/patches/bugfix/arm/disable-broken-config-options.patch vendored Normal file
View File

@ -0,0 +1,78 @@
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/b2c2/Kconfig linux-2.6-2.6.20~rc6/drivers/media/dvb/b2c2/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/b2c2/Kconfig 2007-01-27 12:04:34.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/media/dvb/b2c2/Kconfig 2007-01-29 21:46:10.000000000 -0700
@@ -1,6 +1,6 @@
config DVB_B2C2_FLEXCOP
tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters"
- depends on DVB_CORE && I2C
+ depends on DVB_CORE && I2C && !ARM
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_MT352 if !DVB_FE_CUSTOMISE
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/ttpci/Kconfig linux-2.6-2.6.20~rc6/drivers/media/dvb/ttpci/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/media/dvb/ttpci/Kconfig 2007-01-27 12:04:34.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/media/dvb/ttpci/Kconfig 2007-01-29 21:44:25.000000000 -0700
@@ -60,7 +60,7 @@
config DVB_BUDGET
tristate "Budget cards"
- depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && !ARM
select VIDEO_SAA7146
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
@@ -128,7 +128,7 @@
config DVB_BUDGET_PATCH
tristate "AV7110 cards with Budget Patch"
- depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1
+ depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1 && !ARM
select DVB_AV7110
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/media/video/bt8xx/Kconfig linux-2.6-2.6.20~rc6/drivers/media/video/bt8xx/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/media/video/bt8xx/Kconfig 2006-11-29 14:57:37.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/media/video/bt8xx/Kconfig 2007-01-29 22:09:17.000000000 -0700
@@ -1,6 +1,6 @@
config VIDEO_BT848
tristate "BT848 Video For Linux"
- depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1
+ depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L1 && !ARM
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_BTCX
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/net/wireless/bcm43xx/Kconfig linux-2.6-2.6.20~rc6/drivers/net/wireless/bcm43xx/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/net/wireless/bcm43xx/Kconfig 2006-11-29 14:57:37.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/net/wireless/bcm43xx/Kconfig 2007-01-29 22:07:26.000000000 -0700
@@ -1,6 +1,6 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL
+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && NET_RADIO && EXPERIMENTAL && !ARM
select FW_LOADER
select HW_RANDOM
---help---
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/scsi/Kconfig linux-2.6-2.6.20~rc6/drivers/scsi/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/scsi/Kconfig 2007-01-27 12:04:35.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/scsi/Kconfig 2007-01-29 22:08:55.000000000 -0700
@@ -360,7 +360,7 @@
config SCSI_ACARD
tristate "ACARD SCSI support"
- depends on PCI && SCSI
+ depends on PCI && SCSI && !ARM
help
This driver supports the ACARD SCSI host adapter.
Support Chip <ATP870 ATP876 ATP880 ATP885>
diff -Naur linux-2.6-2.6.20~rc6.orig/drivers/video/Kconfig linux-2.6-2.6.20~rc6/drivers/video/Kconfig
--- linux-2.6-2.6.20~rc6.orig/drivers/video/Kconfig 2007-01-27 12:04:36.000000000 -0700
+++ linux-2.6-2.6.20~rc6/drivers/video/Kconfig 2007-01-29 22:08:21.000000000 -0700
@@ -1149,7 +1149,7 @@
config FB_SAVAGE
tristate "S3 Savage support"
- depends on FB && PCI && EXPERIMENTAL
+ depends on FB && PCI && EXPERIMENTAL && !ARM
select I2C_ALGOBIT if FB_SAVAGE_I2C
select I2C if FB_SAVAGE_I2C
select FB_DDC if FB_SAVAGE_I2C

2
debian/patches/series/1~experimental.1 vendored
View File

@ -26,4 +26,4 @@
+ features/arm/ixp4xx-net-driver-improve-mac-handling.patch
+ bugfix/Makefile-localversion-backup.patch
+ bugfix/drivers-bus_to_virt.patch
+ bugfix/arm/disable-broken-config-options.patch