diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2006-03-29 13:09:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 03:55:25 -0400 |
commit | e4a25edb5ecdf14aa14b909acc6f354e4c8f080c (patch) | |
tree | 7e2d8fe3ff5d8db0d27030460792480806772f57 | |
parent | 328caac78a69fa60be67002e4e7dfab3da87dc64 (diff) |
V4L/DVB (3653b): et61x251: fixed Kconfig menu and Makefile build configuration
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/Kconfig | 12 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 1 | ||||
-rw-r--r-- | drivers/media/video/et61x251/Kconfig | 14 |
3 files changed, 15 insertions, 12 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 80e41d9b7cc9..199d95bf85b5 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -395,17 +395,7 @@ config USB_DSBR | |||
395 | To compile this driver as a module, choose M here: the | 395 | To compile this driver as a module, choose M here: the |
396 | module will be called dsbr100. | 396 | module will be called dsbr100. |
397 | 397 | ||
398 | config USB_ET61X251 | 398 | source "drivers/media/video/et61x251/Kconfig" |
399 | tristate "USB ET61X[12]51 PC Camera Controller support" | ||
400 | depends on USB && VIDEO_DEV | ||
401 | ---help--- | ||
402 | Say Y here if you want support for cameras based on Etoms ET61X151 | ||
403 | or ET61X251 PC Camera Controllers. | ||
404 | |||
405 | See <file:Documentation/usb/et61x251.txt> for more informations. | ||
406 | |||
407 | To compile this driver as a module, choose M here: the | ||
408 | module will be called et61x251. | ||
409 | 399 | ||
410 | config USB_IBMCAM | 400 | config USB_IBMCAM |
411 | tristate "USB IBM (Xirlink) C-it Camera support" | 401 | tristate "USB IBM (Xirlink) C-it Camera support" |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 1c0e72e5a593..10c921f72548 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -65,7 +65,6 @@ obj-$(CONFIG_VIDEO_CX25840) += cx25840/ | |||
65 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o | 65 | obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o |
66 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o | 66 | obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o |
67 | 67 | ||
68 | et61x251-objs := et61x251_core.o et61x251_tas5130d1b.o | ||
69 | zc0301-objs := zc0301_core.o zc0301_pas202bcb.o | 68 | zc0301-objs := zc0301_core.o zc0301_pas202bcb.o |
70 | 69 | ||
71 | obj-$(CONFIG_USB_DABUSB) += dabusb.o | 70 | obj-$(CONFIG_USB_DABUSB) += dabusb.o |
diff --git a/drivers/media/video/et61x251/Kconfig b/drivers/media/video/et61x251/Kconfig new file mode 100644 index 000000000000..d0304c6c0ae8 --- /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/usb/et61x251.txt> for more informations. | ||
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. | ||