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

arm: Refresh patches. 

svn path=/dists/trunk/linux-2.6/; revision=10570
This commit is contained in:
Gordon Farquharson 2008-02-18 06:20:50 +00:00
parent 68ab8acfe9
commit 056a02fda7
8 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
debian/patches/bugfix/arm/disable-ath5k.patch vendored
View File

@ -1,14 +1,13 @@
MODPOST 932 modules
ERROR: "__bad_udelay" [drivers/net/wireless/ath5k/ath5k.ko] undefined!
--- a/drivers/net/wireless/Kconfig 2008-01-19 19:13:01.000000000 +0000
+++ b/drivers/net/wireless/Kconfig 2008-01-19 19:13:25.000000000 +0000
@@ -658,7 +658,7 @@
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index 714a6ca..6c6fa89 100644
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -734,7 +734,7 @@ config P54_PCI
config ATH5K
tristate "Atheros 5xxx wireless cards support"
- depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
+ depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL && (!ARM || BROKEN)
default m
---help---
This module adds support for wireless adapters based on
Atheros 5xxx chipset.

4
debian/patches/bugfix/arm/disable-chelsio_t3.patch vendored
View File

@ -1,8 +1,8 @@
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 81ef81c..c53c9b6 100644
index f337800..9ea3839 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2379,7 +2379,7 @@ config CHELSIO_T1_NAPI
@@ -2494,7 +2494,7 @@ config CHELSIO_T1_NAPI
config CHELSIO_T3
tristate "Chelsio Communications T3 10Gb Ethernet support"

4
debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch vendored
View File

@ -1,12 +1,12 @@
diff --git a/drivers/media/dvb/b2c2/Kconfig b/drivers/media/dvb/b2c2/Kconfig
index 3197aeb..36b1524 100644
index 3197aeb..1d75836 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)
+ 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

16
debian/patches/bugfix/arm/disable-dvb_budget.patch vendored
View File

@ -1,13 +1,13 @@
diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig
index 6d53289..5f0428a 100644
index ae88243..4b905b2 100644
--- a/drivers/media/dvb/ttpci/Kconfig
+++ b/drivers/media/dvb/ttpci/Kconfig
@@ -59,7 +59,7 @@ config DVB_AV7110_OSD
@@ -65,7 +65,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)
config DVB_BUDGET_CORE
tristate "SAA7146 DVB cards (aka Budget, Nova-PCI)"
- depends on DVB_CORE && PCI && I2C
+ depends on DVB_CORE && PCI && I2C && (!ARM || BROKEN)
select VIDEO_SAA7146
select DVB_STV0299 if !DVB_FE_CUSTOMISE
select DVB_VES1X93 if !DVB_FE_CUSTOMISE
select TTPCI_EEPROM
help

6
debian/patches/bugfix/arm/disable-netxen_nic.patch vendored
View File

@ -1,13 +1,13 @@
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c53c9b6..1ed5527 100644
index e55c1c0..e706744 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2488,7 +2488,7 @@ config MYRI10GE
@@ -2616,7 +2616,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)
+ depends on PCI && (!SPARC32 || BROKEN) && (!ARM && BROKEN)
help
This enables the support for NetXen's Gigabit Ethernet card.

6
debian/patches/bugfix/arm/disable-scsi_acard.patch vendored
View File

@ -1,13 +1,13 @@
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 6f2c71e..3fce8f4 100644
index a7a0813..fa6a4fe 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -378,7 +378,7 @@ config SCSI_7000FASST
@@ -396,7 +396,7 @@ config SCSI_7000FASST
config SCSI_ACARD
tristate "ACARD SCSI support"
- depends on PCI && SCSI
+ depends on PCI && SCSI && (!ARM || BROKEN)
+ depends on PCI && SCSI && (!ARM && BROKEN)
help
This driver supports the ACARD SCSI host adapter.
Support Chip <ATP870 ATP876 ATP880 ATP885>

8
debian/patches/bugfix/arm/disable-video_bt848.patch vendored
View File

@ -1,10 +1,12 @@
--- a/drivers/media/video/bt8xx/Kconfig~ 2008-02-14 11:32:42.000000000 +0000
+++ b/drivers/media/video/bt8xx/Kconfig 2008-02-14 11:32:44.000000000 +0000
diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index cfc822b..fd50499 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 VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT && (!ARM && BROKEN)
select I2C_ALGOBIT
select FW_LOADER
select VIDEO_BTCX

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

@ -23,12 +23,12 @@
+ bugfix/ia64/hardcode-arch-script-output.patch
+ bugfix/mips/disable-advansys.patch
+ bugfix/arm/disable-dvb_b2c2_flexcop.patch
#+ bugfix/arm/disable-dvb_budget.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-scsi_acard.patch
#+ bugfix/arm/disable-ath5k.patch
+ bugfix/arm/disable-ath5k.patch
#the following will be fixed before 2.6.25 is out:
+ bugfix/sata_mv-platform_driver.patch
+ bugfix/arm/ignore-invalid-memtags.patch