Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / Makefile.omk

diff --git a/lincan/src/Makefile.omk b/lincan/src/Makefile.omk
index fd53820dd67e9201e1111334d7eecc07ff939b31..72d28119624a903bb4a65fe81623fd214ee3a7a6 100644 (file)
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@ -1,8 +1,8 @@
 lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
-               pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan pikronisa eb8245 \
-               kv_pcican msmcan oscar adlink7841 unican virtual template usbcan
+               pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io pikronisa eb8245 \
+               kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican usbcan virtual template
 
-lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 nsi_canpci
+lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 nsi_canpci sh7760
 
 default_CONFIG = CONFIG_OC_LINCAN=y CONFIG_OC_LINCANRTL=n CONFIG_OC_LINCANVME=n
 default_CONFIG += CONFIG_OC_LINCAN_PORTIO_ONLY=n CONFIG_OC_LINCAN_MEMIO_ONLY=n
@@ -21,7 +21,7 @@ ifeq ($(CONFIG_OC_LINCAN),y)
 rtlinux_INCLUDES = -I $(srcdir)/../include -I .
 kernel_INCLUDES = -I $(srcdir)/../include -I .
 #kernel_INCLUDES += -DCAN_DEBUG
-kernel_INCLUDES += -DWITH_DEVFS_FS -DKBUILD_MODNAME
+kernel_INCLUDES += -DWITH_DEVFS_FS
 
 lincan_cards_SOURCES = $(lincan_cards_SELECTED:%=%.c)
 
@@ -33,6 +33,10 @@ ifeq ($(CONFIG_OC_LINCAN_CARD_ipci165),y)
 lincan_cards_SOURCES += ipci165_fw.c kthread.c
 endif
 
+ifeq ($(CONFIG_OC_LINCAN_CARD_sh7760),y)
+lincan_cards_SOURCES += sh7760.c
+endif
+
 ifeq ($(CONFIG_OC_LINCAN_CARD_usbcan),y)
 lincan_cards_SOURCES += kthread.c
 endif
@@ -57,7 +61,7 @@ endif #CONFIG_OC_LINCANRTL
 
 lincan_SOURCES = can_queue.c can_quekern.c main.c modparms.c \
                devcommon.c setup.c finish.c irq.c sysdep_lnx.c boardlist.c \
-               sja1000p.c sja1000.c i82527.c  \
+               sja1000p.c sja1000.c i82527.c hcan2.c \
                open.c close.c read.c write.c ioctl.c select.c fasync.c \
                proc.c ioctl_query.c ioctl_remote.c \
                $(lincan_cards_SOURCES) $(lincan_rtl_SOURCES)