Move can-dev.ko CAN driver library to drivers/net/can/*

[socketcan-devel.git] / kernel / 2.6 / drivers / net / can / Kconfig

diff --git a/kernel/2.6/drivers/net/can/Kconfig b/kernel/2.6/drivers/net/can/Kconfig
index 1972964252fae85be0d331dea7b406847731bce4..56e9f916a248ca65671c9b0cf1541f8f5b6e2b43 100644 (file)
--- a/kernel/2.6/drivers/net/can/Kconfig
+++ b/kernel/2.6/drivers/net/can/Kconfig
@@ -14,7 +14,7 @@ config CAN_VCAN
 
 config CAN_SLCAN
        tristate "Serial / USB serial CAN Adaptors (slcan)"
-       depends on CAN
+       depends on CAN && EXPERIMENTAL
        default N
        ---help---
          CAN driver for several 'low cost' CAN interfaces that are attached
@@ -24,19 +24,29 @@ config CAN_SLCAN
          This driver can also be built as a module.  If so, the module
          will be called slcan.
 
-config CAN_DEBUG_DEVICES
-       bool "CAN devices debugging messages"
-       depends on CAN
+config CAN_OLD_DRIVERS
+       tristate "Prompt for old CAN drivers (e.g. no sysfs support)"
+       depends on CAN
        default N
-       ---help---
-         Say Y here if you want the CAN device drivers to produce a bunch of
-         debug messages to the system log.  Select this if you are having
-         a problem with CAN support and want to see more of what is going
-         on.
+       ---help---
+         The old drivers do not support sysfs nor proper platform device
+         support. Some of the old drivers might only be configured by
+         module commandline options.
+
+source "drivers/net/can/old/Kconfig"
+
+config CAN_DEV
+       tristate "Prompt for platform CAN drivers with sysfs support"
+       depends on CAN
+       default Y
+       ---help---
+         Enables the common framework for platform CAN drivers with sysfs
+         support. This is the standard library for CAN drivers.
+         If unsure, say Y.
 
 config CAN_SJA1000
-       depends on CAN
-       tristate "Philips SJA1000"
+       depends on CAN_DEV
+               tristate "Philips SJA1000"
        ---help---
          The SJA1000 is one of the top CAN controllers out there. As it
          has a multiplexed interface it fits directly to 8051
@@ -45,24 +55,56 @@ config CAN_SJA1000
          It can send and receive any kinds of CAN frames (SFF/EFF/RTR)
          with a single (simple) filter setup.
 
-config CAN_I82527
-       depends on CAN
-       tristate "Intel 82527"
-       ---help---
-         The i82527 is a complex CAN controller that can handle RTR
-         frame replies on it's own. This feature (and diffent RX filters)  
-         lead to an amount of 15 message objects (for RX & TX). Message
-         object 15 has (as only) a shadow register for a reliable
-         receiption of EFF or(!) SFF frames at high CAN traffic.
-         This driver can send each type of CAN frames (SFF/EFF/RTR).
-         Using 4 message objects it can also receive each type of CAN
-         frames. But due to the onchip filter matching trigger method
-         it is not possible to determine the received RTR CAN-ID.
-         The reliable message object 15 receives SFF frames by default.
-         This message object 15 usage maybe changed with the mo15 param.
+         This driver will use the new device interface.
+
+config CAN_EMS_PCI
+       tristate "EMS CPC-PCI and CPC-PCIe Card"
+       depends on PCI && CAN_SJA1000
+       help
+
+       This driver is for the one or two channel CPC-PCI and CPC-PCIe
+       cards from EMS Dr. Thomas Wuensche (http://www.ems-wuensche.de).
+
+config CAN_IXXAT_PCI
+       tristate "IXXAT PCI Card"
+       depends on PCI && CAN_SJA1000
+       help
+
+       This driver is for the IXXAT PC-I 04/PCI card (1 or 2 channel)
+       from the IXXAT Automation GmbH (http://www.ixxat.de).
+
+config CAN_PEAK_PCI
+       tristate "PEAK PCAN PCI Card"
+       depends on PCI && CAN_SJA1000
+       help
+
+       This driver is for the PCAN PCI, the PC-PCI CAN plug-in card (1 or
+       2 channel) from PEAK Systems (http://www.peak-system.com).
+
+config CAN_PCM027
+        depends on CAN_SJA1000 && MACH_PCM027
+       tristate "Phytec pcm027 can driver (SJA1000)"
+       help
+       This driver adds support for the SJA1000 chip on the PCM027 board
+       from Phytec (http://www.phytec.de).
+
+config CAN_PIPCAN
+       depends on CAN_SJA1000
+       tristate "MPL PIPCAN CAN module driver (SJA1000)"
+       help
+       This driver adds support for the PIPCAN module used on some SBC boards
+       from MPL AG (http://www.mpl.ch).
+
+config CAN_KVASER_PCI
+       tristate "Kvaser PCIcanx and Kvaser PCIcan PCI Cards"
+       depends on PCI && CAN_SJA1000
+       help
+
+       This driver is for the the PCIcanx and PCIcan cards (1, 2 or
+       4 channel) from Kvaser (http://www.kvaser.com).
 
 config CAN_MSCAN
-       depends on CAN && (PPC || M68K || M68KNOMMU)
+       depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
        tristate "Support for a Freescale MSCAN based chips"
        ---help---
          The Motorola Scalable Controller Area Network (MSCAN) definition
@@ -81,17 +123,14 @@ config CAN_MPC52XX
          This driver can also be built as a module.  If so, the module
          will be called mpc52xx_can.
 
-config CAN_CCAN
+config CAN_DEBUG_DEVICES
+       bool "CAN devices debugging messages"
        depends on CAN
-       tristate "Bosch CCAN driver"
-       ---help---
-         This is a driver for the Bosch CCAN controller found for example
-         on the hynix h7202 chip.
-
-config CAN_H7202
-       tristate "Hynix H7202 onboard CAN controller"
-       depends on CAN_CCAN
+       default N
        ---help---
-         This is a driver for the hynix h7202 can controller.
+         Say Y here if you want the CAN device drivers to produce a bunch of
+         debug messages to the system log.  Select this if you are having
+         a problem with CAN support and want to see more of what is going
+         on.
 
 endmenu