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

[Gordon Farquharson]

Author: gordon-guest
Date: Mon Aug 27 05:53:27 2007
New Revision: 9384

Log:
Update broken config options for arm.


Added:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-dvb_budget.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch
Removed:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-broken-config-options-1.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch	Mon Aug 27 05:53:27 2007
@@ -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

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch	Mon Aug 27 05:53:27 2007
@@ -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

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-dvb_budget.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-dvb_budget.patch	Mon Aug 27 05:53:27 2007
@@ -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

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch	Mon Aug 27 05:53:27 2007
@@ -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.
+ 

Added: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch	Mon Aug 27 05:53:27 2007
@@ -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

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	Mon Aug 27 05:53:27 2007
@@ -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