diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:53:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 15:53:57 -0400 |
commit | b043b673dc8a73daa233d5d92cf70b32e7351314 (patch) | |
tree | d17fd0616420886adca7eb1bc19ba7a55a789fa8 /drivers/media/video/et61x251/Kconfig | |
parent | cd5e25d93e6efeb93db7b6731b0a674495270621 (diff) | |
parent | fb9c280d4c6d4586670e3dfd041d8258db36b330 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (49 commits)
V4L/DVB (3667b): cpia2: fix function prototype
V4L/DVB (3702): Make msp3400 routing defines more consistent
V4L/DVB (3700): Remove obsolete commands from tvp5150.c
V4L/DVB (3697): More msp3400 and bttv fixes
V4L/DVB (3696): Previous change for cx2341X boards broke the remote support
V4L/DVB (3693): Fix msp3400c and bttv stereo/mono/bilingual detection/handling
V4L/DVB (3692): Keep experimental SLICED_VBI defines under an #if 0
V4L/DVB (3689): Kconfig: fix VP-3054 Secondary I2C Bus build configuration menu dependencies
V4L/DVB (3673): Fix budget-av CAM reset
V4L/DVB (3672): Fix memory leak in dvr open
V4L/DVB (3671): New module parameter 'tv_standard' (dvb-ttpci driver)
V4L/DVB (3670): Fix typo in comment
V4L/DVB (3669): Configurable dma buffer size for saa7146-based budget dvb cards
V4L/DVB (3653h): Move usb v4l docs into Documentation/video4linux
V4L/DVB (3667a): Fix SAP + stereo mode at msp3400
V4L/DVB (3666): Remove trailing newlines
V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers
V4L/DVB (3663): Fix msp3400c wait time and better audio mode fallbacks
V4L/DVB (3662): Don't set msp3400c-non-existent register
V4L/DVB (3661): Add wm8739 stereo audio ADC i2c driver
...
Diffstat (limited to 'drivers/media/video/et61x251/Kconfig')
-rw-r--r-- | drivers/media/video/et61x251/Kconfig | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig new file mode 100644 index 000000000000..6c43a90c6569 --- /dev/null +++ b/drivers/media/video/et61x251/Kconfig | |||
@@ -0,0 +1,14 @@ | |||
1 | config USB_ET61X251 | ||
2 | tristate "USB ET61X[12]51 PC Camera Controller support" | ||
3 | depends on USB && VIDEO_DEV | ||
4 | ---help--- | ||
5 | Say Y here if you want support for cameras based on Etoms ET61X151 | ||
6 | or ET61X251 PC Camera Controllers. | ||
7 | |||
8 | See <file:Documentation/video4linux/et61x251.txt> for more info. | ||
9 | |||
10 | This driver uses the Video For Linux API. You must say Y or M to | ||
11 | "Video For Linux" to use this driver. | ||
12 | |||
13 | To compile this driver as a module, choose M here: the | ||
14 | module will be called et61x251. | ||