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

git-svn-id: svn://svn.berlios.de//socketcan/trunk@759 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/Makefile b/kernel/2.6/Makefile
index c8fd6c8735a1cd706fec3c8a95e9a364bca3297a..2864902e9af5b8f1e739371a59c3f0c790d74605 100644 (file)
--- a/kernel/2.6/Makefile
+++ b/kernel/2.6/Makefile
@@ -5,9 +5,10 @@ PWD       := $(shell pwd)
 TOPDIR    := $(PWD)
 
 export CONFIG_CAN_VCAN=m
-export CONFIG_CAN_SJA1000=m
+export CONFIG_CAN_DEV=m
 export CONFIG_CAN_SJA1000_OLD=m
 export CONFIG_CAN_I82527_OLD=m
+export CONFIG_CAN_SJA1000=m
 export CONFIG_CAN_EMS_PCI=m
 export CONFIG_CAN_PIPCAN=m
 

diff --git a/kernel/2.6/drivers/net/can/Kconfig b/kernel/2.6/drivers/net/can/Kconfig
index 009dda5fe6648aa1de62c2b971597887663a2bd1..56e9f916a248ca65671c9b0cf1541f8f5b6e2b43 100644 (file)
--- a/kernel/2.6/drivers/net/can/Kconfig
+++ b/kernel/2.6/drivers/net/can/Kconfig
@@ -35,7 +35,17 @@ config CAN_OLD_DRIVERS
 
 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
@@ -94,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

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index ce749dc6ba3102040d8bb02da3c298bce635efa5..11ffa8a09fa1057ca58cae32853b32d2bbd82c26 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -10,6 +10,7 @@ PWD       := $(shell pwd)
 TOPDIR    := $(PWD)/../../..
 
 export CONFIG_CAN_VCAN=m
+export CONFIG_CAN_DEV=m
 export CONFIG_CAN_SJA1000_OLD=m
 export CONFIG_CAN_I82527_OLD=m
 export CONFIG_CAN_SJA1000=m
@@ -23,6 +24,10 @@ else
 
 obj-$(CONFIG_CAN_VCAN)         += vcan.o
 obj-$(CONFIG_CAN_SLCAN)                += slcan.o
+
+obj-$(CONFIG_CAN_DEV)          += can-dev.o
+can-dev-objs                   := dev.o sysfs.o
+
 obj-$(CONFIG_CAN_SJA1000)      += sja1000/
 obj-$(CONFIG_CAN_MSCAN)                += mscan/
 obj-$(CONFIG_CAN_SJA1000_OLD)  += old/sja1000/

diff --git a/kernel/2.6/net/can/dev.c b/kernel/2.6/drivers/net/can/dev.c
similarity index 100%
rename from kernel/2.6/net/can/dev.c
rename to kernel/2.6/drivers/net/can/dev.c

diff --git a/kernel/2.6/net/can/sysfs.c b/kernel/2.6/drivers/net/can/sysfs.c
similarity index 100%
rename from kernel/2.6/net/can/sysfs.c
rename to kernel/2.6/drivers/net/can/sysfs.c

diff --git a/kernel/2.6/net/can/sysfs.h b/kernel/2.6/drivers/net/can/sysfs.h
similarity index 100%
rename from kernel/2.6/net/can/sysfs.h
rename to kernel/2.6/drivers/net/can/sysfs.h

diff --git a/kernel/2.6/net/can/Makefile b/kernel/2.6/net/can/Makefile
index 27a4a780862da5b5a7aeff54ad742d73cc7d7643..a7dbc2af8522c90c8b8d4475ade4be2764ae4b1a 100644 (file)
--- a/kernel/2.6/net/can/Makefile
+++ b/kernel/2.6/net/can/Makefile
@@ -66,7 +66,4 @@ can-raw-objs          := raw.o
 obj-$(CONFIG_CAN_BCM)  += can-bcm.o
 can-bcm-objs           := bcm.o
 
-obj-$(CONFIG_CAN)      += can-dev.o
-can-dev-objs           := dev.o sysfs.o
-
 endif