Moved the work from branches/ha/candrv to trunk.

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

diff --git a/kernel/2.6/drivers/net/can/sja1000/Makefile b/kernel/2.6/drivers/net/can/sja1000/Makefile
index c40262712fd75b052ed0b374727bb76b729f9b93..38dad98a9608fff1951224935f39b68c8e62f502 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/Makefile
+++ b/kernel/2.6/drivers/net/can/sja1000/Makefile
@@ -55,14 +55,16 @@ else
 
 ifneq ($(KBUILD_EXTMOD),)
 EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../include \
+               -I$(KBUILD_EXTMOD)/hal \
                -DETH_P_CAN=0x000C \
                -DARPHRD_CAN=280
 endif
 
-obj-m := sja1000-isa.o sja1000-gw2.o sja1000-mem.o
+obj-m := sja1000-io.o sja1000-iomem.o sja1000-iomux.o sja1000-gw2.o
 
-sja1000-mem-objs := mem.o        sja1000.o proc.o
-sja1000-isa-objs := isa.o        sja1000.o proc.o
-sja1000-gw2-objs := trajet-gw2.o sja1000.o proc.o
+sja1000-io-objs    := sja1000.o proc.o ../hal/io.o
+sja1000-iomem-objs := sja1000.o proc.o ../hal/iomem.o
+sja1000-iomux-objs := sja1000.o proc.o ../hal/iomux.o
+sja1000-gw2-objs   := sja1000.o proc.o ../hal/gw2.o
 
 endif