From a1fdda78e76c413e673096d2abe4369a4ed6d71e Mon Sep 17 00:00:00 2001 From: Gordon Farquharson Date: Mon, 27 Aug 2007 05:53:27 +0000 Subject: [PATCH] Update broken config options for arm. svn path=/dists/trunk/linux-2.6/; revision=9384 --- .../arm/disable-broken-config-options-1.patch | 66 ------------------- .../bugfix/arm/disable-chelsio_t3.patch | 13 ++++ .../bugfix/arm/disable-dvb_b2c2_flexcop.patch | 12 ++++ .../bugfix/arm/disable-dvb_budget.patch | 13 ++++ .../bugfix/arm/disable-netxen_nic.patch | 13 ++++ .../bugfix/arm/disable-video_bt848.patch | 12 ++++ debian/patches/series/1~experimental.1 | 6 +- 7 files changed, 68 insertions(+), 67 deletions(-) delete mode 100644 debian/patches/bugfix/arm/disable-broken-config-options-1.patch create mode 100644 debian/patches/bugfix/arm/disable-chelsio_t3.patch create mode 100644 debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch create mode 100644 debian/patches/bugfix/arm/disable-dvb_budget.patch create mode 100644 debian/patches/bugfix/arm/disable-netxen_nic.patch create mode 100644 debian/patches/bugfix/arm/disable-video_bt848.patch diff --git a/debian/patches/bugfix/arm/disable-broken-config-options-1.patch b/debian/patches/bugfix/arm/disable-broken-config-options-1.patch deleted file mode 100644 index 462704682..000000000 --- a/debian/patches/bugfix/arm/disable-broken-config-options-1.patch +++ /dev/null @@ -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 diff --git a/debian/patches/bugfix/arm/disable-chelsio_t3.patch b/debian/patches/bugfix/arm/disable-chelsio_t3.patch new file mode 100644 index 000000000..dc9ef4b4f --- /dev/null +++ b/debian/patches/bugfix/arm/disable-chelsio_t3.patch @@ -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 diff --git a/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch b/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch new file mode 100644 index 000000000..fef9569c3 --- /dev/null +++ b/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch @@ -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 diff --git a/debian/patches/bugfix/arm/disable-dvb_budget.patch b/debian/patches/bugfix/arm/disable-dvb_budget.patch new file mode 100644 index 000000000..b20cfc1a1 --- /dev/null +++ b/debian/patches/bugfix/arm/disable-dvb_budget.patch @@ -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 diff --git a/debian/patches/bugfix/arm/disable-netxen_nic.patch b/debian/patches/bugfix/arm/disable-netxen_nic.patch new file mode 100644 index 000000000..abc535cdc --- /dev/null +++ b/debian/patches/bugfix/arm/disable-netxen_nic.patch @@ -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. + diff --git a/debian/patches/bugfix/arm/disable-video_bt848.patch b/debian/patches/bugfix/arm/disable-video_bt848.patch new file mode 100644 index 000000000..b21456289 --- /dev/null +++ b/debian/patches/bugfix/arm/disable-video_bt848.patch @@ -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 diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index 27978b178..ea0fca2ac 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -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