4 files changed, 22 insertions, 0 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index f3b077ec0c35..199b01188858 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -306,6 +306,8 @@ config VIDEO_HEXIUM_GEMINI
 
 source "drivers/media/video/cx88/Kconfig"
 
+source "drivers/media/video/em28xx/Kconfig"
+
 config VIDEO_OVCAMCHIP
         tristate "OmniVision Camera Chip support"
         depends on VIDEO_DEV && I2C
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 046b82de9285..123c0a6ed203 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
 obj-$(CONFIG_VIDEO_MEYE) += meye.o
 obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
 obj-$(CONFIG_VIDEO_CX88) += cx88/
+obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
 obj-$(CONFIG_VIDEO_OVCAMCHIP) += ovcamchip/
 obj-$(CONFIG_VIDEO_MXB) += saa7111.o tuner.o tda9840.o tea6415c.o tea6420.o mxb.o
 obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig
new file mode 100644
index 000000000000..46763be711f7
--- /dev/null
+++ b/drivers/media/video/em28xx/Kconfig
@@ -0,0 +1,12 @@
+config VIDEO_EM28XX
+        tristate "Empia EM2800/EM2820/2840 USB video capture support"
+        depends on VIDEO_DEV && USB && I2C
+        select VIDEO_BUF
+        select VIDEO_TUNER
+        select VIDEO_TVEEPROM
+        select VIDEO_IR
+        ---help---
+          This is a video4linux driver for Empia 28xx based TV cards.
+
+          To compile this driver as a module, choose M here: the
+          module will be called em28xx
diff --git a/drivers/media/video/em28xx/Makefile b/drivers/media/video/em28xx/Makefile
new file mode 100644
index 000000000000..573d2b878445
--- /dev/null
+++ b/drivers/media/video/em28xx/Makefile
@@ -0,0 +1,7 @@
+em28xx-objs     := em28xx-video.o em28xx-i2c.o em28xx-cards.o em28xx-core.o \
+                   em28xx-input.o
+
+obj-$(CONFIG_EM28XX) += em28xx.o
+obj-$(CONFIG_EM28XX) += saa711x.o tvp5150.o
+
+EXTRA_CFLAGS += -I$(src)/..