Cleanup of default target configs in Makefiles.

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

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index 7f97362f96f6622598daf0a4434ab441ef237d80..84a6c01572539ee0421a1f0dff411fa3432ef2a9 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -10,18 +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_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:
@@ -42,6 +56,7 @@ obj-$(CONFIG_CAN_CC770)               += cc770/
 obj-$(CONFIG_CAN_SJA1000)      += sja1000/
 obj-$(CONFIG_CAN_SOFTING)      += softing/
 obj-$(CONFIG_CAN_MSCAN)                += mscan/
+obj-$(CONFIG_USB)              += usb/
 obj-$(CONFIG_CAN_AT91)         += at91_can.o
 obj-$(CONFIG_CAN_ESD_PCI331)   += esd_pci331.o
 obj-$(CONFIG_CAN_SJA1000_OLD)  += old/sja1000/
@@ -49,7 +64,6 @@ obj-$(CONFIG_CAN_I82527_OLD)  += old/i82527/
 obj-$(CONFIG_CAN_MSCAN_OLD)    += old/mscan/
 obj-$(CONFIG_CAN_CCAN_OLD)     += old/ccan/
 obj-$(CONFIG_CAN_MCP251X)      += mcp251x.o
-obj-$(CONFIG_CAN_EMS_USB)      += ems_usb.o
 
 ifeq ($(CONFIG_CAN_DEBUG_DEVICES),y)
        EXTRA_CFLAGS += -DDEBUG