  obj-$(CONFIG_DVB_TDA18271C2DD) += tda18271c2dd.o
 -
 +obj-$(CONFIG_DVB_AF9033) += af9033.o
+diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
+index 06c9081..c29d345 100644
+--- a/drivers/staging/Kconfig
++++ b/drivers/staging/Kconfig
+@@ -24,6 +24,8 @@ menuconfig STAGING
+ 
+ if STAGING
+ 
++source "drivers/staging/as102/Kconfig"
++
+ source "drivers/staging/et131x/Kconfig"
+ 
+ source "drivers/staging/slicoss/Kconfig"
+diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
+index f3c5e33..cda7919 100644
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -3,6 +3,7 @@
+ # fix for build system bug...
+ obj-$(CONFIG_STAGING)		+= staging.o
+ 
++obj-$(CONFIG_DVB_AS102)		+= as102/
+ obj-$(CONFIG_ET131X)		+= et131x/
+ obj-$(CONFIG_SLICOSS)		+= slicoss/
+ obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
+diff --git a/drivers/staging/as102/Kconfig b/drivers/staging/as102/Kconfig
+new file mode 100644
+index 0000000..b3902a9
+--- /dev/null
++++ b/drivers/staging/as102/Kconfig
+@@ -0,0 +1,9 @@
++config DVB_AS102
++       tristate "Abilis AS102 DVB receiver"
++       depends on DVB_CORE && USB && I2C && INPUT
++       select FW_LOADER
++       help
++         Choose Y or M here if you have a device containing an AS102
++
++         To compile this driver as a module, choose M here
++
+diff --git a/drivers/staging/as102/Makefile b/drivers/staging/as102/Makefile
+new file mode 100644
+index 0000000..e6f47fe
+--- /dev/null
++++ b/drivers/staging/as102/Makefile
+@@ -0,0 +1,7 @@
++dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \
++               as102_fe.o as102_usb_drv.o as10x_cmd_cfg.o
++
++obj-$(CONFIG_DVB_AS102) += dvb-as102.o
++
++EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
++

+dvb-usb-af9035-objs = af9035.o
+obj-$(CONFIG_DVB_USB_AF9035) += dvb-usb-af9035.o
+
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
 # due to tuner-xc3028
 EXTRA_CFLAGS += -Idrivers/media/common/tuners
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
index 2a79b8f..b31b607 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
@@ -323,4 +323,23 @@
 #define USB_PID_TECHNISAT_USB2_HDCI_V2			0x0002
 #define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2		0x0004
 #define USB_PID_TECHNISAT_USB2_DVB_S2			0x0500

 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
diff --git a/drivers/media/dvb/dvb-usb/Kconfig b/drivers/media/dvb/dvb-usb/Kconfig
index 5d73dec..a9e7268 100644
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
@@ -374,3 +374,30 @@ config DVB_USB_TECHNISAT_USB2
 	select DVB_STV6110x if !DVB_FE_CUSTOMISE
 	help
 	  Say Y here to support the Technisat USB2 DVB-S/S2 device
