Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 17 insertions, 0 deletions

diff --git a/drivers/misc/carma/Kconfig b/drivers/misc/carma/Kconfig
new file mode 100644
index 000000000000..c90370ed712b
--- /dev/null
+++ b/drivers/misc/carma/Kconfig
@@ -0,0 +1,17 @@
+config CARMA_FPGA
+        tristate "CARMA DATA-FPGA Access Driver"
+        depends on FSL_SOC && PPC_83xx && MEDIA_SUPPORT && HAS_DMA && FSL_DMA
+        select VIDEOBUF_DMA_SG
+        default n
+        help
+          Say Y here to include support for communicating with the data
+          processing FPGAs on the OVRO CARMA board.
+
+config CARMA_FPGA_PROGRAM
+        tristate "CARMA DATA-FPGA Programmer"
+        depends on FSL_SOC && PPC_83xx && MEDIA_SUPPORT && HAS_DMA && FSL_DMA
+        select VIDEOBUF_DMA_SG
+        default n
+        help
+          Say Y here to include support for programming the data processing
+          FPGAs on the OVRO CARMA board.