diff -ruN fritz/src/driver.c fritz.new/src/driver.c
--- fritz/src/driver.c	2005-07-07 00:00:00.000000000 +0200
+++ fritz.new/src/driver.c	2007-06-18 16:03:37.000000000 +0200
@@ -901,10 +901,10 @@
 
 /*---------------------------------------------------------------------------*\
 \*---------------------------------------------------------------------------*/
-int driver_init (void) {
+int driver_initnew (void) {
 
 	return (NULL != (capi_lib = link_library (NULL)));
-} /* driver_init */
+} /* driver_initnew */
 
 /*---------------------------------------------------------------------------*\
 \*---------------------------------------------------------------------------*/
diff -ruN fritz/src/driver.h fritz.new/src/driver.h
--- fritz/src/driver.h	2005-07-07 00:00:00.000000000 +0200
+++ fritz.new/src/driver.h	2007-06-18 15:58:25.000000000 +0200
@@ -23,7 +23,6 @@
 #ifndef __have_driver_h__
 #define __have_driver_h__
 
-#include <linux/config.h>
 #include <linux/skbuff.h>
 #include <linux/capi.h>
 #include <linux/list.h>
@@ -98,7 +97,7 @@
 
 /*---------------------------------------------------------------------------*\
 \*---------------------------------------------------------------------------*/
-extern int driver_init (void);
+extern int driver_initnew (void);
 extern void driver_exit (void);
 
 /*---------------------------------------------------------------------------*\
diff -ruN fritz/src/main.c fritz.new/src/main.c
--- fritz/src/main.c	2005-07-07 00:00:00.000000000 +0200
+++ fritz.new/src/main.c	2007-06-18 16:14:24.000000000 +0200
@@ -22,7 +22,6 @@
 
 #include <stdarg.h>
 #include <asm/uaccess.h>
-#include <linux/config.h>
 #include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -47,7 +46,7 @@
 #include "lib.h"
 #include "defs.h"
 
-MODULE_LICENSE ("Proprietary");
+MODULE_LICENSE ("GPL");
 MODULE_DESCRIPTION ("CAPI4Linux: Driver for " PRODUCT_LOGO);
 
 /*---------------------------------------------------------------------------*\
@@ -205,7 +204,7 @@
 	NOTE(PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
 
 	NOTE("Loading...\n");
-	if (!driver_init ()) {
+	if (!driver_initnew ()) {
 		ERROR("Error: Driver library not available.\n");
 		ERROR("Not loaded.\n");
 		return res;
@@ -270,7 +269,7 @@
 	NOTE (PRODUCT_LOGO " found: port 0x%04x, irq %u\n", pars.port, pars.irq);
 
 	NOTE("Loading...\n");
-	if (!driver_init ()) {
+	if (!driver_initnew ()) {
 		ERROR("Error: Driver library not available.\n");
 		ERROR("Not loaded.\n");
 		return -EBUSY;
@@ -378,7 +377,7 @@
 	}
 	return err;
 #elif defined (__fcpcmcia__) || defined (__fcclassic__)
-	if (!driver_init ()) {
+	if (!driver_initnew ()) {
 		ERROR("Error: Driver library not available.\n");
 		ERROR("Not loaded.\n");
 		return -EBUSY;
diff -ruN fritz/src/.tmp_versions/fcpci.mod fritz.new/src/.tmp_versions/fcpci.mod
--- fritz/src/.tmp_versions/fcpci.mod	1970-01-01 01:00:00.000000000 +0100
+++ fritz.new/src/.tmp_versions/fcpci.mod	2007-06-18 16:15:34.000000000 +0200
@@ -0,0 +1,2 @@
+/usr/src/fritz.new/src/fcpci.ko
+/usr/src/fritz.new/src/main.o /usr/src/fritz.new/src/driver.o /usr/src/fritz.new/src/tools.o /usr/src/fritz.new/src/tables.o /usr/src/fritz.new/src/queue.o /usr/src/fritz.new/src/lib.o
diff -ruN fritz/src/tools.h fritz.new/src/tools.h
--- fritz/src/tools.h	2005-07-07 00:00:00.000000000 +0200
+++ fritz.new/src/tools.h	2007-06-18 16:02:21.000000000 +0200
@@ -71,13 +71,13 @@
 
 /*---------------------------------------------------------------------------*\
 \*---------------------------------------------------------------------------*/
+/*
 static inline unsigned long atomic_xchg (
 	volatile atomic_t *	v, 
 	unsigned		value
 ) {
 	return __xchg (value, &v->counter, sizeof (unsigned));
 } /* atomic_xchg */
-
 /*---------------------------------------------------------------------------*\
 \*---------------------------------------------------------------------------*/
 #ifndef NDEBUG