diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-23 17:20:58 -0400 |
commit | 9528454f9c02fb9c359c4c42c69eed4d47407e39 (patch) | |
tree | 40e8c7f829b528073d2b216c3b8e6be205c76245 /drivers/media/video/sn9c102/Kconfig | |
parent | 777e1d4a0f3387933f668e7adc81384827975189 (diff) | |
parent | 1faadface9c5d000bb16e42c89f24859337cf2db (diff) |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/media/video/sn9c102/Kconfig')
-rw-r--r-- | drivers/media/video/sn9c102/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig index 55f2bc11964b..cf552e6b8ecf 100644 --- a/drivers/media/video/sn9c102/Kconfig +++ b/drivers/media/video/sn9c102/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config USB_SN9C102 | 1 | config USB_SN9C102 |
2 | tristate "USB SN9C10x PC Camera Controller support" | 2 | tristate "USB SN9C10x PC Camera Controller support" |
3 | depends on USB && VIDEO_DEV | 3 | depends on USB && VIDEO_V4L1 |
4 | ---help--- | 4 | ---help--- |
5 | Say Y here if you want support for cameras based on SONiX SN9C101, | 5 | Say Y here if you want support for cameras based on SONiX SN9C101, |
6 | SN9C102 or SN9C103 PC Camera Controllers. | 6 | SN9C102 or SN9C103 PC Camera Controllers. |