---

yaml
---
r: 13427
b: refs/heads/master
c: 15871a2
h: refs/heads/master
i:
  13425: 456f5c0
  13423: bfffbfc
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 404b32fb3d93c17f994ad4b1d852ce4ca682ff8b
+refs/heads/master: 15871a2905b84d6dba9013dbcbd9c79ace694ffb

trunk/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

trunk/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

trunk/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

trunk/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)/..