[kernel] r11391 - in dists/sid/linux-2.6/debian: . patches/bugfix/arm

[Maximilian Attems]

Author: maks
Date: Thu May 15 22:24:40 2008
New Revision: 11391

Log:
urrgs Kconfig logic fuckup in arm patches

don't disable drivers for all other plattforms, thanks :P


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch
   dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch
   dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch
   dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu May 15 22:24:40 2008
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.25-4) UNRELEASED; urgency=low
+
+  * Fix arm Kconfig logic disabling random drivers. (closes: #481410)
+
+ -- maximilian attems <maks at debian.org>  Fri, 16 May 2008 00:16:56 +0200
+
 linux-2.6 (2.6.25-3) unstable; urgency=low
 
   [ Bastian Blank ]

Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-dvb_b2c2_flexcop.patch	Thu May 15 22:24:40 2008
@@ -6,7 +6,7 @@
  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

Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-netxen_nic.patch	Thu May 15 22:24:40 2008
@@ -7,7 +7,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)
++	depends on PCI && (!SPARC32 || BROKEN) && (!ARM || BROKEN)
  	help
  	  This enables the support for NetXen's Gigabit Ethernet card.
  

Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-scsi_acard.patch	Thu May 15 22:24:40 2008
@@ -7,7 +7,7 @@
  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>

Modified: dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch	(original)
+++ dists/sid/linux-2.6/debian/patches/bugfix/arm/disable-video_bt848.patch	Thu May 15 22:24:40 2008
@@ -6,7 +6,7 @@
  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