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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
new file mode 100644
index 000000000000..ffb9773d102d
--- /dev/null
+++ b/drivers/net/can/c_can/Kconfig
@@ -0,0 +1,15 @@
+menuconfig CAN_C_CAN
+        tristate "Bosch C_CAN devices"
+        depends on CAN_DEV && HAS_IOMEM
+
+if CAN_C_CAN
+
+config CAN_C_CAN_PLATFORM
+        tristate "Generic Platform Bus based C_CAN driver"
+        ---help---
+          This driver adds support for the C_CAN chips connected to
+          the "platform bus" (Linux abstraction for directly to the
+          processor attached devices) which can be found on various
+          boards from ST Microelectronics (http://www.st.com)
+          like the SPEAr1310 and SPEAr320 evaluation boards.
+endif