Actual driver code for directly mapped SJA1000 into PCI mem region 0.

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

diff --git a/lincan/src/Makefile.std b/lincan/src/Makefile.std
index 037766c4550a30e5ec1452c7351742cf9fe70083..900cf91250c04cb6169834ecf8b6b2b6c7f105c2 100644 (file)
--- a/lincan/src/Makefile.std
+++ b/lincan/src/Makefile.std
@@ -63,7 +63,8 @@ endif
 
 SUPPORTED_CARDS = pip pccan smartcan nsi cc_can104 \
                  pc_i03 pcm3680 aim104 m437 pcccan ssv \
-                 bfadcan gensja1000mm gensja1000io kv_pcican msmcan virtual template \
+                 bfadcan gensja1000mm gensja1000io pcisja1000mm \
+                 kv_pcican msmcan virtual template \
                  unican unican_cl2 ems_cpcpci adlink7841 oscar \
                  pcan_pci esdpci200
 #                hms30c7202_can c_can c_can_irq tscan1
@@ -103,6 +104,10 @@ ifeq ($(KERNEL_VERSION),)
 KERNEL_VERSION=$(shell grep UTS_RELEASE ${KERNEL_LOCATION}/include/linux/utsrelease.h | \
                  sed 's/[^"]*"\(.*\)\{1\}"/\1/')
 endif
+ifeq ($(KERNEL_VERSION),)
+KERNEL_VERSION=$(shell grep UTS_RELEASE ${KERNEL_LOCATION}/include/generated/utsrelease.h | \
+                 sed 's/[^"]*"\(.*\)\{1\}"/\1/')
+endif
 
 #$(warning KERNEL_VERSION = $(KERNEL_VERSION))
 
@@ -143,7 +148,7 @@ endif
 # Target object file if any
 # this must be undefined for 2.5.xx kernels
 ifndef KERNEL_MODULE_V26
-O_TARGET     = can.o
+O_TARGET     = lincan.o
 endif
 # Regular object files
 O_OBJS      += $(SUPPORTED_CARDS:%=%.o)
@@ -166,9 +171,11 @@ LX_OBJS      =
 EXTRA_CFLAGS +=
 
 # Linux 2.4.2 and newer build system needs next
-can-objs = $(O_OBJS)
+lincan-objs = $(O_OBJS)
+ifndef KERNEL_MODULE_V26
 obj-y = $(O_OBJS)
-obj-m = can.o
+endif
+obj-m = lincan.o
 
 ifndef KERNEL_MODULE_V26
 FINAL_MODULE_OBJS=$(obj-m)
@@ -194,8 +201,8 @@ make_this_module: lincan_config.h
        echo Linux kernel version $(KERNEL_VERSION)
        echo Linux kernel sources $(KERNEL_LOCATION)
        echo Module target $(obj-m)
-       echo Module objects $(can-objs)
-       DIR=`pwd`; (cd $(KERNEL_LOCATION); make SUBDIRS=$$DIR modules)
+       echo Module objects $(lincan-objs)
+       DIR=`pwd`; (cd $(KERNEL_LOCATION); make M=$$DIR SUBDIRS=$$DIR modules)
 
 make_this_module_dep:
        DIR=`pwd`; (cd $(KERNEL_LOCATION); make SUBDIRS=$$DIR dep)