diff options
| author | Ben Hutchings <benh@debian.org> | 2012-12-16 15:20:29 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-12-16 15:20:29 +0000 |
| commit | 8123ace851707cad1ea78ea2330e62928f3a7fa1 (patch) | |
| tree | 042d327637a3d43fa9831285668f746dca71730a /debian/patches/debian/dfsg/vs6624-disable.patch | |
| parent | ef781eb6eec9b61b82a8bafc92718bd49d95ba0f (diff) | |
Update to 3.7
Update aufs to aufs3.x-rcN-20121210.
Disable rt, probably not available for 3.7.
Refresh/drop patches. They apply but the result may not build.
svn path=/dists/trunk/linux/; revision=19608
Diffstat (limited to 'debian/patches/debian/dfsg/vs6624-disable.patch')
| -rw-r--r-- | debian/patches/debian/dfsg/vs6624-disable.patch | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/debian/patches/debian/dfsg/vs6624-disable.patch b/debian/patches/debian/dfsg/vs6624-disable.patch index e36b6d127..08dba87be 100644 --- a/debian/patches/debian/dfsg/vs6624-disable.patch +++ b/debian/patches/debian/dfsg/vs6624-disable.patch @@ -1,8 +1,14 @@ -diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig -index ce1e7ba..4bd5a0c 100644 ---- a/drivers/media/video/Kconfig -+++ b/drivers/media/video/Kconfig -@@ -497,2 +497,3 @@ config VIDEO_OV7670 +From: Ben Hutchings <ben@decadent.org.uk> +Date: Sun, 27 May 2012 01:56:58 +0100 +Subject: vs6624: mark as broken + +--- a/drivers/media/i2c/Kconfig ++++ b/drivers/media/i2c/Kconfig +@@ -422,6 +422,7 @@ config VIDEO_OV7670 + controller. + config VIDEO_VS6624 + depends on BROKEN tristate "ST VS6624 sensor support" + depends on VIDEO_V4L2 && I2C + depends on MEDIA_CAMERA_SUPPORT |