From cee2fc2fd043de2372a61ef955df27300470ccea Mon Sep 17 00:00:00 2001
From: Urs Thuermann <urs.thuermann@volkswagen.de>
Date: Fri, 7 Jul 2006 06:58:26 +0000
Subject: [PATCH] Remove remnants of the projects VW history (Email addresses,
 Makefile targets). Move version.h to include/linux/can. Fix Makefiles to
 include raw.ko and bcm.ko in compilation and to make vcan compile again.
 Change ioctl names in SJA1000 driver to make it compile again. Add
 parenthesis around assignment in vcan.c to eliminate gcc warning.

---
 Makefile      | 22 +++++-----------------
 can-sniffer.c |  2 +-
 candump.c     |  2 +-
 terminal.h    |  2 +-
 4 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index bceec58..4707154 100644
--- a/Makefile
+++ b/Makefile
@@ -38,28 +38,16 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 #  DAMAGE.
 #
-#  Send feedback to <llcf@volkswagen.de>
+#  Send feedback to <socketcan-users@lists.berlios.de>
 
 CFLAGS    = -O2 -Wall -Wno-parentheses -I../kernel/2.4/can -fno-strict-aliasing
 
-PROGRAMS_GPL = 	candump		\
-		can-sniffer
+PROGRAMS = candump can-sniffer
 
-PROGRAMS_VW = 	tpdump		\
-		tp20-sniffer	\
-		mcnet-vit-emu	\
-		mcnet-sniffer	\
-		pq35speed
-
-default: all-gpl
-
-all: all-gpl all-vw
-
-all-gpl: $(PROGRAMS_GPL)
-all-vw:  $(PROGRAMS_VW)
+all: $(PROGRAMS)
 
 clean:
-	rm -f $(PROGRAMS_GPL) $(PROGRAMS_VW)
+	rm -f $(PROGRAMS)
 
 distclean:
-	rm -f $(PROGRAMS_GPL) $(PROGRAMS_VW) *~
+	rm -f $(PROGRAMS) *~
diff --git a/can-sniffer.c b/can-sniffer.c
index f67a590..d40f48c 100644
--- a/can-sniffer.c
+++ b/can-sniffer.c
@@ -42,7 +42,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <llcf@volkswagen.de>
+ * Send feedback to <socketcan-users@lists.berlios.de>
  *
  */
 
diff --git a/candump.c b/candump.c
index 6c9843f..aefa02a 100644
--- a/candump.c
+++ b/candump.c
@@ -42,7 +42,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <llcf@volkswagen.de>
+ * Send feedback to <socketcan-users@lists.berlios.de>
  *
  */
 
diff --git a/terminal.h b/terminal.h
index ad1b0dd..d069592 100644
--- a/terminal.h
+++ b/terminal.h
@@ -40,7 +40,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <llcf@volkswagen.de>
+ * Send feedback to <socketcan-users@lists.berlios.de>
  *
  */