Merge remote-tracking branch 'agl/master' into flounder

Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>

1 files changed, 21 insertions, 0 deletions

diff --git a/Kconfig b/Kconfig
new file mode 100644
index 0000000..b15bcbe
--- /dev/null
+++ b/Kconfig
@@ -0,0 +1,21 @@
+menuconfig AVIRT
+        tristate "AVIRT support"
+        default n
+        ---help---
+	  Say Y here if you want to enable AVIRT support.
+	  This driver needs at least one additional audio path in
+	  order to establish audio routing.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called avirt_core.
+
+          If in doubt, say N here.
+
+
+
+if AVIRT
+
+source "drivers/staging/avirt/dummy/Kconfig"
+source "drivers/staging/avirt/loopback/Kconfig"
+
+endif