Moved vcan driver to 2.4/drivers/net/can.

TODO: Make 2.4/drivers/net/can/Makefile compile all drivers in one process.

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

diff --git a/kernel/2.4/drivers/net/can/Makefile b/kernel/2.4/drivers/net/can/Makefile
new file mode 100644 (file)
index 0000000..e84f79f
--- /dev/null
+++ b/kernel/2.4/drivers/net/can/Makefile
@@ -0,0 +1,80 @@
+#
+#  $Id: Makefile 602 2007-12-12 11:42:10Z hartkopp $
+#
+#  Copyright (c) 2002-2005 Volkswagen Group Electronic Research
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions, the following disclaimer and
+#     the referenced file 'COPYING'.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of Volkswagen nor the names of its contributors
+#     may be used to endorse or promote products derived from this software
+#     without specific prior written permission.
+#
+#  Alternatively, provided that this notice is retained in full, this
+#  software may be distributed under the terms of the GNU General
+#  Public License ("GPL") version 2 as distributed in the 'COPYING'
+#  file from the main directory of the linux kernel source.
+#
+#  The provided data structures and external interfaces from this code
+#  are not restricted to be used by modules with a GPL compatible license.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+#  DAMAGE.
+#
+#  Send feedback to <socketcan-users@lists.berlios.de>
+
+
+KERNELDIR = /usr/src/linux
+
+CFLAGS    = -O2 -Wall -Wno-parentheses -D__KERNEL__ -DMODULE $(DEBUG) \
+               -I$(KERNELDIR)/include -I../../../include -fno-strict-aliasing \
+               -DETH_P_CAN=0x000C \
+               -DARPHRD_CAN=280 \
+               -DPF_CAN=29 \
+               -DAF_CAN=PF_CAN
+
+
+
+VERSION       = $(shell awk '/^VERSION/     {print $$3}' $(KERNELDIR)/Makefile)
+PATCHLEVEL    = $(shell awk '/^PATCHLEVEL/  {print $$3}' $(KERNELDIR)/Makefile)
+SUBLEVEL      = $(shell awk '/^SUBLEVEL/    {print $$3}' $(KERNELDIR)/Makefile)
+EXTRAVERSION  = $(shell awk '/^EXTRAVERSION/{print $$3}' $(KERNELDIR)/Makefile)
+KERNELRELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
+
+MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)/llcf
+
+MOD = vcan.o
+
+all: $(MOD)
+
+ifeq "$(strip $(INSTALL_MOD_PATH))" ""
+DEPMOD_BASE :=
+else
+DEPMOD_BASE := -r -b $(INSTALL_MOD_PATH)
+endif
+
+install: $(MOD)
+       install -m 755 -d $(MODLIB)
+       install -m 644 $^ $(MODLIB)
+       depmod -ae -F $(KERNELDIR)/System.map $(DEPMOD_BASE) $(KERNELRELEASE)
+
+clean:
+       rm -f *.o
+

diff --git a/kernel/2.4/net/can/vcan.c b/kernel/2.4/drivers/net/can/vcan.c
similarity index 100%
rename from kernel/2.4/net/can/vcan.c
rename to kernel/2.4/drivers/net/can/vcan.c

diff --git a/kernel/2.4/net/can/Makefile b/kernel/2.4/net/can/Makefile
index b51459761dcfd0d698e920fbb6e62fa5a905e91a..f540a57920b4e4a16f557f14f63d85c5ae32471c 100644 (file)
--- a/kernel/2.4/net/can/Makefile
+++ b/kernel/2.4/net/can/Makefile
@@ -60,7 +60,7 @@ KERNELRELEASE = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
 MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)/llcf
 
-MOD = can.o vcan.o can-bcm.o can-raw.o
+MOD = can.o can-bcm.o can-raw.o
 
 all: $(MOD)