Cleanup of default target configs in Makefiles.

Removed currently SVN-unmaintained drivers from default targets:

- the USB drivers EMS_USB and ESD_USB2 (are part of the Mainline kernel)
- the PCMCIA drivers (EMS/SOFTING) do not compile on recent kernels

Added to default targets:
- slcan
- cc770

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

diff --git a/kernel/2.6/Makefile b/kernel/2.6/Makefile
index fd9ad54f862bc14546d685c1d7125e086c23a20a..ab128cb6e45e728d555fa8408143fea73b99a21d 100644 (file)
--- a/kernel/2.6/Makefile
+++ b/kernel/2.6/Makefile
@@ -11,6 +11,9 @@ export CONFIG_CAN_CALC_BITTIMING=y
 #export CONFIG_CAN_DEV_SYSFS=y
 #export CONFIG_CAN_SJA1000_OLD=m
 #export CONFIG_CAN_I82527_OLD=m
+export CONFIG_CAN_CC770=m
+export CONFIG_CAN_CC770_ISA=m
+#export CONFIG_CAN_CC770_OF_PLATFORM=m
 export CONFIG_CAN_SJA1000=m
 export CONFIG_CAN_SJA1000_PLATFORM=m
 #export CONFIG_CAN_SJA1000_OF_PLATFORM=m
@@ -19,15 +22,15 @@ export CONFIG_CAN_PLX_PCI=m
 export CONFIG_CAN_PEAK_PCI=m
 export CONFIG_CAN_KVASER_PCI=m
 export CONFIG_CAN_EMS_PCI=m
-export CONFIG_CAN_EMS_USB=m
-export CONFIG_CAN_EMS_PCMCIA=m
+#export CONFIG_CAN_EMS_USB=m
+#export CONFIG_CAN_EMS_PCMCIA=m
 export CONFIG_CAN_EMS_104M=m
 export CONFIG_CAN_ESD_PCI=m
 export CONFIG_CAN_ESD_PCI331=m
-export CONFIG_CAN_ESD_USB2=m
+#export CONFIG_CAN_ESD_USB2=m
 export CONFIG_CAN_PIPCAN=m
-export CONFIG_CAN_SOFTING=m
-export CONFIG_CAN_SOFTING_CS=m
+#export CONFIG_CAN_SOFTING=m
+#export CONFIG_CAN_SOFTING_CS=m
 export CONFIG_CAN_MCP251X=m
 
 export CONFIG_CAN=m

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index c7988fc77bdf911209e593092c8fcdad97492d52..84a6c01572539ee0421a1f0dff411fa3432ef2a9 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -10,20 +10,32 @@ PWD       := $(shell pwd)
 TOPDIR    := $(PWD)/../../..
 
 export CONFIG_CAN_VCAN=m
+export CONFIG_CAN_SLCAN=m
 export CONFIG_CAN_DEV=m
+export CONFIG_CAN_CALC_BITTIMING=y
+#export CONFIG_CAN_DEV_SYSFS=y
 #export CONFIG_CAN_SJA1000_OLD=m
 #export CONFIG_CAN_I82527_OLD=m
 export CONFIG_CAN_CC770=m
+export CONFIG_CAN_CC770_ISA=m
+#export CONFIG_CAN_CC770_OF_PLATFORM=m
 export CONFIG_CAN_SJA1000=m
 export CONFIG_CAN_SJA1000_PLATFORM=m
+#export CONFIG_CAN_SJA1000_OF_PLATFORM=m
+export CONFIG_CAN_IXXAT_PCI=m
 export CONFIG_CAN_PLX_PCI=m
+export CONFIG_CAN_PEAK_PCI=m
+export CONFIG_CAN_KVASER_PCI=m
 export CONFIG_CAN_EMS_PCI=m
-export CONFIG_CAN_EMS_PCMCIA=m
+#export CONFIG_CAN_EMS_USB=m
+#export CONFIG_CAN_EMS_PCMCIA=m
+export CONFIG_CAN_EMS_104M=m
+export CONFIG_CAN_ESD_PCI=m
 export CONFIG_CAN_ESD_PCI331=m
-export CONFIG_CAN_ESD_USB2=m
+#export CONFIG_CAN_ESD_USB2=m
 export CONFIG_CAN_PIPCAN=m
-export CONFIG_CAN_SOFTING=m
-export CONFIG_CAN_SOFTING_CS=m
+#export CONFIG_CAN_SOFTING=m
+#export CONFIG_CAN_SOFTING_CS=m
 export CONFIG_CAN_MCP251X=m
 
 modules modules_install clean: