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.

diff --git a/Makefile b/Makefile
index bceec585188dd32b96ce618b14746d660d0105af..47071540285e3cb8537bd3220bab3a58a7458240 100644 (file)
--- 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 f67a590780ab1ad206ab138969ffedb2502960ef..d40f48c4e94fc85cfbfd93d0db3a78f719969c18 100644 (file)
--- 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 6c9843fde16d36cad3521de94f8cc1cae401a90a..aefa02a9f90a900dbcf67f5b96fd9cc114fb9ee6 100644 (file)
--- 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 ad1b0dd1e2920ca95454592265a039c0065d94e0..d069592ec8028844dcfa1c492df5c70738bfddb1 100644 (file)
--- 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>
  *
  */