Added netlink powered CAN gateway functionality with CAN frame modification features.

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

diff --git a/kernel/2.6/net/can/Makefile b/kernel/2.6/net/can/Makefile
index ab908716aec415fc0b22a94f91eced6d501d49bb..065fdbc85ac12b6f21859bdf12cbc8e40b18c8c5 100644 (file)
--- a/kernel/2.6/net/can/Makefile
+++ b/kernel/2.6/net/can/Makefile
@@ -1,44 +1,6 @@
 #
 #  $Id$
 #
-#  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>
 
 ifeq ($(KERNELRELEASE),)
 
@@ -52,10 +14,12 @@ modules modules_install clean:
 export CONFIG_CAN=m
 export CONFIG_CAN_RAW=m
 export CONFIG_CAN_BCM=m
+export CONFIG_CAN_ISOTP=m
+export CONFIG_CAN_GW=m
 
 else
 
-include $(TOPDIR)/Makefile.common
+-include $(TOPDIR)/Makefile.common
 
 obj-$(CONFIG_CAN)      += can.o
 can-objs               := af_can.o proc.o
@@ -66,7 +30,10 @@ can-raw-objs         := raw.o
 obj-$(CONFIG_CAN_BCM)  += can-bcm.o
 can-bcm-objs           := bcm.o
 
-obj-$(CONFIG_CAN)      += candev.o
-candev-objs            := dev.o
+obj-$(CONFIG_CAN_ISOTP)        += can-isotp.o
+can-isotp-objs         := isotp.o
+
+obj-$(CONFIG_CAN_GW)   += can-gw.o
+can-gw-objs            := gw.o
 
 endif