1 files changed, 0 insertions, 241 deletions
diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig
deleted file mode 100644
index 189d40f96be5..000000000000
--- a/drivers/usb/media/Kconfig
+++ /dev/null
@@ -1,241 +0,0 @@
-#
-# USB Multimedia device configuration
-#
-comment "USB Multimedia devices"
-        depends on USB
-config USB_DABUSB
-        tristate "DABUSB driver"
-        depends on USB
-        ---help---
-          A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
-          brought to you by the DAB-Team
-          <http://wwwbode.cs.tum.edu/Par/arch/dab/>.  This driver can be taken
-          as an example for URB-based bulk, control, and isochronous
-          transactions. URB's are explained in
-          <file:Documentation/usb/URB.txt>.
-          To compile this driver as a module, choose M here: the
-          module will be called dabusb.
-comment "Video4Linux support is needed for USB Multimedia device support"
-        depends on USB && VIDEO_DEV=n
-config USB_VICAM
-        tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
-        ---help---
-          Say Y here if you have 3com homeconnect camera (vicam).
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Multimedia Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called vicam.
-config USB_DSBR
-        tristate "D-Link USB FM radio support (EXPERIMENTAL)"
-        depends on USB && VIDEO_DEV && EXPERIMENTAL
-        ---help---
-          Say Y here if you want to connect this type of radio to your
-          computer's USB port. Note that the audio is not digital, and
-          you must connect the line out connector to a sound card or a
-          set of speakers.
-          This driver uses the Video For Linux API.  You must enable
-          (Y or M in config) Video For Linux (under Character Devices)
-          to use this driver.  Information on this API and pointers to
-          "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called dsbr100.
-config USB_ET61X251
-        tristate "USB ET61X[12]51 PC Camera Controller support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for cameras based on Etoms ET61X151
-          or ET61X251 PC Camera Controllers.
-          See <file:Documentation/usb/et61x251.txt> for more informations.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
-          To compile this driver as a module, choose M here: the
-          module will be called et61x251.
-config USB_IBMCAM
-        tristate "USB IBM (Xirlink) C-it Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect a IBM "C-It" camera, also known as
-          "Xirlink PC Camera" to your computer's USB port.  For more
-          information, read <file:Documentation/usb/ibmcam.txt>.
-          This driver uses the Video For Linux API.  You must enable
-          (Y or M in config) Video For Linux (under Character Devices)
-          to use this driver.  Information on this API and pointers to
-          "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called ibmcam.
-          This camera has several configuration options which
-          can be specified when you load the module. Read
-          <file:Documentation/usb/ibmcam.txt> to learn more.
-config USB_KONICAWC
-        tristate "USB Konica Webcam support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for webcams based on a Konica
-          chipset. This is known to work with the Intel YC76 webcam.
-          This driver uses the Video For Linux API.  You must enable
-          (Y or M in config) Video For Linux (under Character Devices)
-          to use this driver.  Information on this API and pointers to
-          "v4l" programs may be found at
-          <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called konicawc.
-config USB_OV511
-        tristate "USB OV511 Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. See <file:Documentation/usb/ov511.txt> for more
-          information and for a list of supported cameras.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Character Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called ov511.
-config USB_SE401
-        tristate "USB SE401 Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. See <file:Documentation/usb/se401.txt> for more
-          information and for a list of supported cameras.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Multimedia Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called se401.
-config USB_SN9C102
-        tristate "USB SN9C10x PC Camera Controller support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for cameras based on SONiX SN9C101,
-          SN9C102 or SN9C103 PC Camera Controllers.
-          See <file:Documentation/usb/sn9c102.txt> for more informations.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
-          To compile this driver as a module, choose M here: the
-          module will be called sn9c102.
-config USB_STV680
-        tristate "USB STV680 (Pencam) Camera support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want to connect this type of camera to your
-          computer's USB port. This includes the Pencam line of cameras.
-          See <file:Documentation/usb/stv680.txt> for more information and for
-          a list of supported cameras.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Multimedia Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called stv680.
-config USB_W9968CF
-        tristate "USB W996[87]CF JPEG Dual Mode Camera support"
-        depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
-        ---help---
-          Say Y here if you want support for cameras based on OV681 or
-          Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
-        
-          This driver has an optional plugin, which is distributed as a
-          separate module only (released under GPL). It allows to use higher 
-          resolutions and framerates, but cannot be included in the official 
-          Linux kernel for performance purposes.
-          See <file:Documentation/usb/w9968cf.txt> for more informations.
-          This driver uses the Video For Linux and the I2C APIs. It needs the
-          OmniVision Camera Chip support as well. You must say Y or M to
-          "Video For Linux", "I2C Support" and "OmniVision Camera Chip 
-          support" to use this driver.
-          To compile this driver as a module, choose M here: the
-          module will be called w9968cf.
-config USB_ZC0301
-        tristate "USB ZC0301 Image Processor and Control Chip support"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y here if you want support for cameras based on the ZC0301
-          Image Processor and Control Chip.
-          See <file:Documentation/usb/zc0301.txt> for more informations.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" to use this driver.
-          To compile this driver as a module, choose M here: the
-          module will be called zc0301.
-config USB_PWC
-        tristate "USB Philips Cameras"
-        depends on USB && VIDEO_DEV
-        ---help---
-          Say Y or M here if you want to use one of these Philips & OEM
-          webcams:
-           * Philips PCA645, PCA646
-           * Philips PCVC675, PCVC680, PCVC690
-           * Philips PCVC720/40, PCVC730, PCVC740, PCVC750
-           * Askey VC010
-           * Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro' 
-             and 'Orbit'/'Sphere'
-           * Samsung MPC-C10, MPC-C30
-           * Creative Webcam 5, Pro Ex
-           * SOTEC Afina Eye
-           * Visionite VCS-UC300, VCS-UM100
-           
-          The PCA635, PCVC665 and PCVC720/20 are not supported by this driver
-          and never will be, but the 665 and 720/20 are supported by other 
-          drivers.
-          See <file:Documentation/usb/philips.txt> for more information and
-          installation instructions.
-          The built-in microphone is enabled by selecting USB Audio support.
-          This driver uses the Video For Linux API. You must say Y or M to
-          "Video For Linux" (under Character Devices) to use this driver.
-          Information on this API and pointers to "v4l" programs may be found
-          at <file:Documentation/video4linux/API.html>.
-          To compile this driver as a module, choose M here: the
-          module will be called pwc.

diff --git a/drivers/usb/media/Kconfig b/drivers/usb/media/Kconfig deleted file mode 100644 index 189d40f96be5..000000000000 --- a/drivers/usb/media/Kconfig +++ /dev/null
@@ -1,241 +0,0 @@
1	#
2	# USB Multimedia device configuration
3	#
4	comment "USB Multimedia devices"
5	depends on USB
6
7	config USB_DABUSB
8	tristate "DABUSB driver"
9	depends on USB
10	---help---
11	A Digital Audio Broadcasting (DAB) Receiver for USB and Linux
12	brought to you by the DAB-Team
13	<http://wwwbode.cs.tum.edu/Par/arch/dab/>. This driver can be taken
14	as an example for URB-based bulk, control, and isochronous
15	transactions. URB's are explained in
16	<file:Documentation/usb/URB.txt>.
17
18	To compile this driver as a module, choose M here: the
19	module will be called dabusb.
20
21	comment "Video4Linux support is needed for USB Multimedia device support"
22	depends on USB && VIDEO_DEV=n
23
24	config USB_VICAM
25	tristate "USB 3com HomeConnect (aka vicam) support (EXPERIMENTAL)"
26	depends on USB && VIDEO_DEV && EXPERIMENTAL
27	---help---
28	Say Y here if you have 3com homeconnect camera (vicam).
29
30	This driver uses the Video For Linux API. You must say Y or M to
31	"Video For Linux" (under Multimedia Devices) to use this driver.
32	Information on this API and pointers to "v4l" programs may be found
33	at <file:Documentation/video4linux/API.html>.
34
35	To compile this driver as a module, choose M here: the
36	module will be called vicam.
37
38	config USB_DSBR
39	tristate "D-Link USB FM radio support (EXPERIMENTAL)"
40	depends on USB && VIDEO_DEV && EXPERIMENTAL
41	---help---
42	Say Y here if you want to connect this type of radio to your
43	computer's USB port. Note that the audio is not digital, and
44	you must connect the line out connector to a sound card or a
45	set of speakers.
46
47	This driver uses the Video For Linux API. You must enable
48	(Y or M in config) Video For Linux (under Character Devices)
49	to use this driver. Information on this API and pointers to
50	"v4l" programs may be found at
51	<file:Documentation/video4linux/API.html>.
52
53	To compile this driver as a module, choose M here: the
54	module will be called dsbr100.
55
56	config USB_ET61X251
57	tristate "USB ET61X[12]51 PC Camera Controller support"
58	depends on USB && VIDEO_DEV
59	---help---
60	Say Y here if you want support for cameras based on Etoms ET61X151
61	or ET61X251 PC Camera Controllers.
62
63	See <file:Documentation/usb/et61x251.txt> for more informations.
64
65	This driver uses the Video For Linux API. You must say Y or M to
66	"Video For Linux" to use this driver.
67
68	To compile this driver as a module, choose M here: the
69	module will be called et61x251.
70
71	config USB_IBMCAM
72	tristate "USB IBM (Xirlink) C-it Camera support"
73	depends on USB && VIDEO_DEV
74	---help---
75	Say Y here if you want to connect a IBM "C-It" camera, also known as
76	"Xirlink PC Camera" to your computer's USB port. For more
77	information, read <file:Documentation/usb/ibmcam.txt>.
78
79	This driver uses the Video For Linux API. You must enable
80	(Y or M in config) Video For Linux (under Character Devices)
81	to use this driver. Information on this API and pointers to
82	"v4l" programs may be found at
83	<file:Documentation/video4linux/API.html>.
84
85	To compile this driver as a module, choose M here: the
86	module will be called ibmcam.
87
88	This camera has several configuration options which
89	can be specified when you load the module. Read
90	<file:Documentation/usb/ibmcam.txt> to learn more.
91
92	config USB_KONICAWC
93	tristate "USB Konica Webcam support"
94	depends on USB && VIDEO_DEV
95	---help---
96	Say Y here if you want support for webcams based on a Konica
97	chipset. This is known to work with the Intel YC76 webcam.
98
99	This driver uses the Video For Linux API. You must enable
100	(Y or M in config) Video For Linux (under Character Devices)
101	to use this driver. Information on this API and pointers to
102	"v4l" programs may be found at
103	<file:Documentation/video4linux/API.html>.
104
105	To compile this driver as a module, choose M here: the
106	module will be called konicawc.
107
108	config USB_OV511
109	tristate "USB OV511 Camera support"
110	depends on USB && VIDEO_DEV
111	---help---
112	Say Y here if you want to connect this type of camera to your
113	computer's USB port. See <file:Documentation/usb/ov511.txt> for more
114	information and for a list of supported cameras.
115
116	This driver uses the Video For Linux API. You must say Y or M to
117	"Video For Linux" (under Character Devices) to use this driver.
118	Information on this API and pointers to "v4l" programs may be found
119	at <file:Documentation/video4linux/API.html>.
120
121	To compile this driver as a module, choose M here: the
122	module will be called ov511.
123
124	config USB_SE401
125	tristate "USB SE401 Camera support"
126	depends on USB && VIDEO_DEV
127	---help---
128	Say Y here if you want to connect this type of camera to your
129	computer's USB port. See <file:Documentation/usb/se401.txt> for more
130	information and for a list of supported cameras.
131
132	This driver uses the Video For Linux API. You must say Y or M to
133	"Video For Linux" (under Multimedia Devices) to use this driver.
134	Information on this API and pointers to "v4l" programs may be found
135	at <file:Documentation/video4linux/API.html>.
136
137	To compile this driver as a module, choose M here: the
138	module will be called se401.
139
140	config USB_SN9C102
141	tristate "USB SN9C10x PC Camera Controller support"
142	depends on USB && VIDEO_DEV
143	---help---
144	Say Y here if you want support for cameras based on SONiX SN9C101,
145	SN9C102 or SN9C103 PC Camera Controllers.
146
147	See <file:Documentation/usb/sn9c102.txt> for more informations.
148
149	This driver uses the Video For Linux API. You must say Y or M to
150	"Video For Linux" to use this driver.
151
152	To compile this driver as a module, choose M here: the
153	module will be called sn9c102.
154
155	config USB_STV680
156	tristate "USB STV680 (Pencam) Camera support"
157	depends on USB && VIDEO_DEV
158	---help---
159	Say Y here if you want to connect this type of camera to your
160	computer's USB port. This includes the Pencam line of cameras.
161	See <file:Documentation/usb/stv680.txt> for more information and for
162	a list of supported cameras.
163
164	This driver uses the Video For Linux API. You must say Y or M to
165	"Video For Linux" (under Multimedia Devices) to use this driver.
166	Information on this API and pointers to "v4l" programs may be found
167	at <file:Documentation/video4linux/API.html>.
168
169	To compile this driver as a module, choose M here: the
170	module will be called stv680.
171
172	config USB_W9968CF
173	tristate "USB W996[87]CF JPEG Dual Mode Camera support"
174	depends on USB && VIDEO_DEV && I2C && VIDEO_OVCAMCHIP
175	---help---
176	Say Y here if you want support for cameras based on OV681 or
177	Winbond W9967CF/W9968CF JPEG USB Dual Mode Camera Chips.
178
179	This driver has an optional plugin, which is distributed as a
180	separate module only (released under GPL). It allows to use higher
181	resolutions and framerates, but cannot be included in the official
182	Linux kernel for performance purposes.
183
184	See <file:Documentation/usb/w9968cf.txt> for more informations.
185
186	This driver uses the Video For Linux and the I2C APIs. It needs the
187	OmniVision Camera Chip support as well. You must say Y or M to
188	"Video For Linux", "I2C Support" and "OmniVision Camera Chip
189	support" to use this driver.
190
191	To compile this driver as a module, choose M here: the
192	module will be called w9968cf.
193
194	config USB_ZC0301
195	tristate "USB ZC0301 Image Processor and Control Chip support"
196	depends on USB && VIDEO_DEV
197	---help---
198	Say Y here if you want support for cameras based on the ZC0301
199	Image Processor and Control Chip.
200
201	See <file:Documentation/usb/zc0301.txt> for more informations.
202
203	This driver uses the Video For Linux API. You must say Y or M to
204	"Video For Linux" to use this driver.
205
206	To compile this driver as a module, choose M here: the
207	module will be called zc0301.
208
209	config USB_PWC
210	tristate "USB Philips Cameras"
211	depends on USB && VIDEO_DEV
212	---help---
213	Say Y or M here if you want to use one of these Philips & OEM
214	webcams:
215	* Philips PCA645, PCA646
216	* Philips PCVC675, PCVC680, PCVC690
217	* Philips PCVC720/40, PCVC730, PCVC740, PCVC750
218	* Askey VC010
219	* Logitech QuickCam Pro 3000, 4000, 'Zoom', 'Notebook Pro'
220	and 'Orbit'/'Sphere'
221	* Samsung MPC-C10, MPC-C30
222	* Creative Webcam 5, Pro Ex
223	* SOTEC Afina Eye
224	* Visionite VCS-UC300, VCS-UM100
225
226	The PCA635, PCVC665 and PCVC720/20 are not supported by this driver
227	and never will be, but the 665 and 720/20 are supported by other
228	drivers.
229
230	See <file:Documentation/usb/philips.txt> for more information and
231	installation instructions.
232
233	The built-in microphone is enabled by selecting USB Audio support.
234
235	This driver uses the Video For Linux API. You must say Y or M to
236	"Video For Linux" (under Character Devices) to use this driver.
237	Information on this API and pointers to "v4l" programs may be found
238	at <file:Documentation/video4linux/API.html>.
239
240	To compile this driver as a module, choose M here: the
241	module will be called pwc.