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

[Martin Michlmayr]

Author: tbm
Date: Thu Feb 14 13:32:01 2008
New Revision: 10547

Log:
update patch


Modified:
   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-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	Thu Feb 14 13:32:01 2008
@@ -1,12 +1,10 @@
-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
+--- 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
 @@ -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)
+-	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT
++	depends on VIDEO_DEV && PCI && I2C && VIDEO_V4L2 && INPUT && (!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	Thu Feb 14 13:32:01 2008
@@ -24,7 +24,7 @@
 #+ 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-video_bt848.patch
 + bugfix/arm/disable-scsi_acard.patch
 #+ bugfix/arm/disable-ath5k.patch
 #the following will be fixed before 2.6.25 is out: