diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/video/sn9c102/Kconfig | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/video/sn9c102/Kconfig')
| -rw-r--r-- | drivers/media/video/sn9c102/Kconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/sn9c102/Kconfig b/drivers/media/video/sn9c102/Kconfig index f71f272776de..6ebaf2940d06 100644 --- a/drivers/media/video/sn9c102/Kconfig +++ b/drivers/media/video/sn9c102/Kconfig | |||
| @@ -1,7 +1,10 @@ | |||
| 1 | config USB_SN9C102 | 1 | config USB_SN9C102 |
| 2 | tristate "USB SN9C1xx PC Camera Controller support" | 2 | tristate "USB SN9C1xx PC Camera Controller support (DEPRECATED)" |
| 3 | depends on VIDEO_V4L2 | 3 | depends on VIDEO_V4L2 |
| 4 | ---help--- | 4 | ---help--- |
| 5 | This driver is DEPRECATED please use the gspca sonixb and | ||
| 6 | sonixj modules instead. | ||
| 7 | |||
| 5 | Say Y here if you want support for cameras based on SONiX SN9C101, | 8 | Say Y here if you want support for cameras based on SONiX SN9C101, |
| 6 | SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers. | 9 | SN9C102, SN9C103, SN9C105 and SN9C120 PC Camera Controllers. |
| 7 | 10 | ||