From 5b4f1736a2780ca476fa15694de3a1f798f87f6f Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Mon, 19 May 2008 19:08:12 +0000 Subject: [PATCH] update patch svn path=/dists/trunk/linux-2.6/; revision=11423 --- debian/patches/bugfix/arm/disable-video_bt848.patch | 9 ++++----- debian/patches/series/1~experimental.1 | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/patches/bugfix/arm/disable-video_bt848.patch b/debian/patches/bugfix/arm/disable-video_bt848.patch index 33f718558..8eda3db03 100644 --- a/debian/patches/bugfix/arm/disable-video_bt848.patch +++ b/debian/patches/bugfix/arm/disable-video_bt848.patch @@ -1,12 +1,11 @@ -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 +--- 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 @@ -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 + diff --git a/debian/patches/series/1~experimental.1 b/debian/patches/series/1~experimental.1 index df925a78a..f4d93e6ad 100644 --- a/debian/patches/series/1~experimental.1 +++ b/debian/patches/series/1~experimental.1 @@ -23,7 +23,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 + bugfix/arm/disable-r6040.patch