Update broken config options for arm.

svn path=/dists/trunk/linux-2.6/; revision=9384
This commit is contained in:
Gordon Farquharson 2007-08-27 05:53:27 +00:00
parent a3cc6821d2
commit a1fdda78e7
7 changed files with 68 additions and 67 deletions

View File

@ -1,66 +0,0 @@
diff -Naur a/drivers/net/Kconfig b/drivers/net/Kconfig
--- a/drivers/net/Kconfig 2007-05-21 22:04:46.000000000 -0600
+++ b/drivers/net/Kconfig 2007-05-21 21:06:52.000000000 -0600
@@ -2363,7 +2363,7 @@
config CHELSIO_T3
tristate "Chelsio Communications T3 10Gb Ethernet support"
- depends on PCI
+ depends on PCI && (!ARM || BROKEN)
select FW_LOADER
help
This driver supports Chelsio T3-based gigabit and 10Gb Ethernet
@@ -2472,7 +2472,7 @@
config NETXEN_NIC
tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
- depends on PCI && (!SPARC32 || BROKEN)
+ depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN)
help
This enables the support for NetXen's Gigabit Ethernet card.
diff -Naur a/drivers/net/wireless/bcm43xx/Kconfig b/drivers/net/wireless/bcm43xx/Kconfig
--- a/drivers/net/wireless/bcm43xx/Kconfig 2007-05-20 00:58:33.000000000 -0600
+++ b/drivers/net/wireless/bcm43xx/Kconfig 2007-05-21 21:56:15.000000000 -0600
@@ -1,6 +1,6 @@
config BCM43XX
tristate "Broadcom BCM43xx wireless support"
- depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL
+ depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL && (!ARM || BROKEN)
select WIRELESS_EXT
select FW_LOADER
select HW_RANDOM
diff -Naur a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
--- a/drivers/media/video/bt8xx/Kconfig 2007-04-25 21:08:32.000000000 -0600
+++ b/drivers/media/video/bt8xx/Kconfig 2007-05-28 18:12:26.000000000 -0600
@@ -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 || BROKEN)
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_BTCX
diff -Naur a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
--- a/drivers/media/dvb/b2c2/Kconfig 2007-05-26 02:12:02.000000000 -0600
+++ b/drivers/media/dvb/b2c2/Kconfig 2007-06-05 22:02:44.000000000 -0600
@@ -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 || BROKEN)
select DVB_PLL
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_MT352 if !DVB_FE_CUSTOMISE
diff -Naur a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
--- a/drivers/media/dvb/ttpci/Kconfig 2007-05-26 02:12:02.000000000 -0600
+++ b/drivers/media/dvb/ttpci/Kconfig 2007-06-05 22:01:34.000000000 -0600
@@ -59,7 +59,7 @@
config DVB_BUDGET
tristate "Budget cards"
- depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && (!ARM || BROKEN)
select VIDEO_SAA7146
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_VES1X93 if !DVB_FE_CUSTOMISE

View File

@ -0,0 +1,13 @@
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 81ef81c..c53c9b6 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2379,7 +2379,7 @@ config CHELSIO_T1_NAPI
config CHELSIO_T3
tristate "Chelsio Communications T3 10Gb Ethernet support"
- depends on PCI
+ depends on PCI && (!ARM || BROKEN)
select FW_LOADER
help
This driver supports Chelsio T3-based gigabit and 10Gb Ethernet

View File

@ -0,0 +1,12 @@
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 3197aeb..36b1524 100644
--- a/drivers/media/dvb/b2c2/Kconfig
+++ b/drivers/media/dvb/b2c2/Kconfig
@@ -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 || BROKEN)
select DVB_PLL if !DVB_FE_CUSTOMISE
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_MT352 if !DVB_FE_CUSTOMISE

View File

@ -0,0 +1,13 @@
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 6d53289..5f0428a 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -59,7 +59,7 @@ config DVB_AV7110_OSD
config DVB_BUDGET
tristate "Budget cards"
- depends on DVB_CORE && PCI && I2C && VIDEO_V4L1
+ depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 && (!ARM || BROKEN)
select VIDEO_SAA7146
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_VES1X93 if !DVB_FE_CUSTOMISE

View File

@ -0,0 +1,13 @@
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c53c9b6..1ed5527 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2488,7 +2488,7 @@ config MYRI10GE
config NETXEN_NIC
tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC"
- depends on PCI && (!SPARC32 || BROKEN)
+ depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN)
help
This enables the support for NetXen's Gigabit Ethernet card.

View File

@ -0,0 +1,12 @@
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 58eae88..21558f9 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -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 || BROKEN)
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_BTCX

View File

@ -34,4 +34,8 @@
+ features/fintek-f75375.patch
#+ features/alpha/isa-mapping-support.patch
+ bugfix/powerpc/libgcc-__ucmpdi2.patch
#+ bugfix/arm/disable-broken-config-options-1.patch
+ bugfix/arm/disable-dvb_b2c2_flexcop.patch
+ bugfix/arm/disable-dvb_budget.patch
+ bugfix/arm/disable-netxen_nic.patch
+ bugfix/arm/disable-chelsio_t3.patch
+ bugfix/arm/disable-video_bt848.patch