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

[Martin Michlmayr]

Author: tbm
Date: Sun Aug  3 06:23:30 2008
New Revision: 11949

Log:
refresh arm patches


Modified:
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-ath5k.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch
   dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-ath5k.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-ath5k.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-ath5k.patch	Sun Aug  3 06:23:30 2008
@@ -1,11 +1,12 @@
---- a/drivers/net/wireless/ath5k/Kconfig~	2008-05-11 18:18:24.000000000 +0000
-+++ b/drivers/net/wireless/ath5k/Kconfig	2008-05-11 18:18:35.000000000 +0000
+diff --git a/drivers/net/wireless/ath5k/Kconfig b/drivers/net/wireless/ath5k/Kconfig
+index 75383a5..02bfd02 100644
+--- a/drivers/net/wireless/ath5k/Kconfig
++++ b/drivers/net/wireless/ath5k/Kconfig
 @@ -1,6 +1,6 @@
  config ATH5K
  	tristate "Atheros 5xxx wireless cards support"
 -	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
 +	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL && (!ARM || BROKEN)
- 	---help---
- 	  This module adds support for wireless adapters based on
- 	  Atheros 5xxx chipset.
-
+ 	select MAC80211_LEDS
+ 	select LEDS_CLASS
+ 	select NEW_LEDS

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-chelsio_t3.patch	Sun Aug  3 06:23:30 2008
@@ -1,13 +1,13 @@
 diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
-index f337800..9ea3839 100644
+index fa533c2..d9aa85f 100644
 --- a/drivers/net/Kconfig
 +++ b/drivers/net/Kconfig
-@@ -2494,7 +2494,7 @@ config CHELSIO_T1_NAPI
+@@ -2348,7 +2348,7 @@ config CHELSIO_T1_1G
  
  config CHELSIO_T3
  	tristate "Chelsio Communications T3 10Gb Ethernet support"
--	depends on PCI
-+	depends on PCI && (!ARM || BROKEN)
+-	depends on PCI && INET
++	depends on PCI && INET && (!ARM || BROKEN)
  	select FW_LOADER
+ 	select INET_LRO
  	help
- 	  This driver supports Chelsio T3-based gigabit and 10Gb Ethernet

Modified: dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch	Sun Aug  3 06:23:30 2008
@@ -1,11 +1,12 @@
---- a/drivers/media/video/bt8xx/Kconfig	2008-05-19 19:06:35.000000000 +0000
-+++ b/drivers/media/video/bt8xx/Kconfig	2008-05-19 19:07:17.000000000 +0000
+diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
+index ce71e8e..15a3f6d 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_V4L2 && INPUT
 +	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT && (!ARM || BROKEN)
- 	depends on HOTPLUG	# due to FW_LOADER
  	select I2C_ALGOBIT
- 	select FW_LOADER
-
+ 	select VIDEO_BTCX
+ 	select VIDEOBUF_DMA_SG

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	Sun Aug  3 06:23:30 2008
@@ -23,10 +23,10 @@
 + 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
++ bugfix/arm/disable-chelsio_t3.patch
++ bugfix/arm/disable-video_bt848.patch
 + bugfix/arm/disable-scsi_acard.patch
-#+ bugfix/arm/disable-ath5k.patch
++ bugfix/arm/disable-ath5k.patch
 + bugfix/arm/disable-r6040.patch
 + bugfix/arm/kurobox_fix_nr_controllers.patch
 + bugfix/arm/xfs_pack_dir2_struct.patch