Merge tag 'v3.10' into master-next

[vajnamar/linux-xlnx.git] / drivers / staging / Kconfig

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index aefe820a8005585934f9d80b2d62a69b44555b29..26e6ac59e9aceb0a61f6ead27f849f5622a8dc4a 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -140,4 +140,8 @@ source "drivers/staging/netlogic/Kconfig"
 
 source "drivers/staging/dwc2/Kconfig"
 
+source "drivers/staging/video/axivdma/Kconfig"
+
+source "drivers/staging/video/imageon/Kconfig"
+
 endif # STAGING