From 9419142d1002c4553a6538e592abe97e193e3250 Mon Sep 17 00:00:00 2001
From: Martin Michlmayr <tbm@cyrius.com>
Date: Sun, 19 Nov 2006 16:36:58 +0000
Subject: [PATCH] arm/ixp4xx: Enable more V4L USB devices.

svn path=/dists/sid/linux-2.6/; revision=7845
---
 debian/arch/arm/config.ixp4xx | 68 +++++++++++++++++++++++++----------
 debian/changelog              |  1 +
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx
index cb4ab9b25..437ebc5d7 100644
--- a/debian/arch/arm/config.ixp4xx
+++ b/debian/arch/arm/config.ixp4xx
@@ -1183,6 +1183,9 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 # Multimedia devices
 #
 CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_V4L1_COMPAT=y
+CONFIG_VIDEO_V4L2=y
 
 #
 # Video Capture Adapters
@@ -1192,11 +1195,17 @@ CONFIG_VIDEO_DEV=m
 # Video Capture Adapters
 #
 # CONFIG_VIDEO_ADV_DEBUG is not set
+CONFIG_VIDEO_VIVI=m
 CONFIG_VIDEO_BT848=m
 # CONFIG_VIDEO_BT848_DVB is not set
 # CONFIG_VIDEO_SAA6588 is not set
+# CONFIG_VIDEO_BWQCAM is not set
+CONFIG_VIDEO_CQCAM=m
+# CONFIG_VIDEO_W9966 is not set
 CONFIG_VIDEO_CPIA=m
+# CONFIG_VIDEO_CPIA_PP is not set
 # CONFIG_VIDEO_CPIA_USB is not set
+CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_SAA5246A=m
 CONFIG_VIDEO_SAA5249=m
 CONFIG_TUNER_3036=m
@@ -1207,6 +1216,7 @@ CONFIG_VIDEO_ZORAN_DC10=m
 CONFIG_VIDEO_ZORAN_DC30=m
 CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
+CONFIG_VIDEO_ZORAN_AVS6EYES=m
 CONFIG_VIDEO_SAA7134=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 # CONFIG_VIDEO_SAA7134_DVB is not set
@@ -1216,12 +1226,48 @@ CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
 CONFIG_VIDEO_CX88=m
 # CONFIG_VIDEO_CX88_ALSA is not set
+CONFIG_VIDEO_CX88_BLACKBIRD=m
 # CONFIG_VIDEO_CX88_DVB is not set
-CONFIG_VIDEO_CX88_VP3054=m
+
+#
+# Encoders and Decoders
+#
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_CX25840=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# V4L USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_24XXX=y
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_USBVIDEO=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_QUICKCAM_MESSENGER=m
+CONFIG_USB_ET61X251=m
 CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_VIDEO_AUDIO_DECODER=m
-CONFIG_VIDEO_DECODER=m
+CONFIG_USB_W9968CF=m
+CONFIG_USB_OV511=m
+CONFIG_USB_SE401=m
+CONFIG_USB_SN9C102=m
+CONFIG_USB_STV680=m
+CONFIG_USB_ZC0301=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+
 
 #
 # Radio Adapters
@@ -1229,6 +1275,7 @@ CONFIG_VIDEO_DECODER=m
 # CONFIG_RADIO_GEMTEK_PCI is not set
 # CONFIG_RADIO_MAXIRADIO is not set
 # CONFIG_RADIO_MAESTRO is not set
+# CONFIG_USB_DSBR is not set
 
 #
 # Digital Video Broadcasting Devices
@@ -1545,21 +1592,6 @@ CONFIG_USB_APPLETOUCH=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_MICROTEK=m
 
-#
-# USB Multimedia devices
-#
-# CONFIG_USB_VICAM is not set
-# CONFIG_USB_DSBR is not set
-# CONFIG_USB_ET61X251 is not set
-# CONFIG_USB_IBMCAM is not set
-# CONFIG_USB_KONICAWC is not set
-# CONFIG_USB_OV511 is not set
-# CONFIG_USB_SE401 is not set
-# CONFIG_USB_SN9C102 is not set
-# CONFIG_USB_STV680 is not set
-# CONFIG_USB_W9968CF is not set
-# CONFIG_USB_PWC is not set
-
 #
 # USB Network Adapters
 #
diff --git a/debian/changelog b/debian/changelog
index e13e1fc4f..c60b7b112 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,7 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low
   * arm/ixp4xx: Swap the disk 1 and disk 2 LED definitions so they're right.
   * mipsel/r5k-cobalt: Unset CONFIG_SCSI_SYM53C8XX_2 because the timeout is
     just too long.
+  * arm/ixp4xx: Enable more V4L USB devices.
 
   [ dann frazier ]
   * Backport various SCTP changesets from 2.6.19, recommended by Vlad Yasevich