ALSA: ASoC: Convert wm8990 to a new-style i2c driver

[linux-2.6-omap-h63xx.git] / net / can / Kconfig

diff --git a/net/can/Kconfig b/net/can/Kconfig
index 8b92790747e583bdce141197f6fc818d63d6d906..89395b2c8bcaf6d41b4f84b37d02beec643f2fee 100644 (file)
--- a/net/can/Kconfig
+++ b/net/can/Kconfig
@@ -15,3 +15,30 @@ menuconfig CAN
 
          If you want CAN support you should say Y here and also to the
          specific driver for your controller(s) below.
+
+config CAN_RAW
+       tristate "Raw CAN Protocol (raw access with CAN-ID filtering)"
+       depends on CAN
+       default N
+       ---help---
+         The raw CAN protocol option offers access to the CAN bus via
+         the BSD socket API. You probably want to use the raw socket in
+         most cases where no higher level protocol is being used. The raw
+         socket has several filter options e.g. ID masking / error frames.
+         To receive/send raw CAN messages, use AF_CAN with protocol CAN_RAW.
+
+config CAN_BCM
+       tristate "Broadcast Manager CAN Protocol (with content filtering)"
+       depends on CAN
+       default N
+       ---help---
+         The Broadcast Manager offers content filtering, timeout monitoring,
+         sending of RTR frames, and cyclic CAN messages without permanent user
+         interaction. The BCM can be 'programmed' via the BSD socket API and
+         informs you on demand e.g. only on content updates / timeouts.
+         You probably want to use the bcm socket in most cases where cyclic
+         CAN messages are used on the bus (e.g. in automotive environments).
+         To use the Broadcast Manager, use AF_CAN with protocol CAN_BCM.
+
+
+source "drivers/net/can/Kconfig"