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 4d7e46ec38f5bc26e04fca945f33f52685b32638..56e9f916a248ca65671c9b0cf1541f8f5b6e2b43 100644 (file)
--- a/kernel/2.6/drivers/net/can/Kconfig
+++ b/kernel/2.6/drivers/net/can/Kconfig
@@ -12,17 +12,6 @@ config CAN_VCAN
          This driver can also be built as a module.  If so, the module
          will be called vcan.
 
-config CAN_OLD_DRIVERS
-       tristate "Prompt for old CAN drivers (e.g. no sysfs support)"
-       depends on CAN
-       default N
-       ---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_SLCAN
        tristate "Serial / USB serial CAN Adaptors (slcan)"
        depends on CAN && EXPERIMENTAL
@@ -35,7 +24,28 @@ config CAN_SLCAN
          This driver can also be built as a module.  If so, the module
          will be called slcan.
 
+config CAN_OLD_DRIVERS
+       tristate "Prompt for old CAN drivers (e.g. no sysfs support)"
+       depends on CAN
+       default N
+       ---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_DEV
                tristate "Philips SJA1000"
        ---help---
          The SJA1000 is one of the top CAN controllers out there. As it
@@ -78,6 +88,13 @@ config CAN_PCM027
        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
@@ -87,7 +104,7 @@ config CAN_KVASER_PCI
        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