6 files changed, 4 insertions, 11 deletions
diff --git a/hw/kdrive/i810/Makefile.am b/hw/kdrive/i810/Makefile.am
index 79093da60..e3a702dde 100644
--- a/hw/kdrive/i810/Makefile.am
+++ b/hw/kdrive/i810/Makefile.am
@@ -28,5 +28,9 @@ Xi810_LDADD = \
 	@KDRIVE_LIBS@                                  \
 	@XSERVER_LIBS@					
 
+Xi810_DEPENDENCIES =	\
+	libi810.a 					\
+	@KDRIVE_LOCAL_LIBS@
+
 relink:
 	rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS)
diff --git a/hw/kdrive/i810/i810.c b/hw/kdrive/i810/i810.c
index d2318d786..49090f9eb 100644
--- a/hw/kdrive/i810/i810.c
+++ b/hw/kdrive/i810/i810.c
@@ -31,9 +31,6 @@ of the copyright holder.
 
 X Window System is a trademark of The Open Group */
 
-
-/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810.c,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
-
 /*
  * i810.c - KDrive driver for the i810 chipset
  *
diff --git a/hw/kdrive/i810/i810.h b/hw/kdrive/i810/i810.h
index e0f6f8173..8fc2d56be 100644
--- a/hw/kdrive/i810/i810.h
+++ b/hw/kdrive/i810/i810.h
@@ -31,8 +31,6 @@ of the copyright holder.
 
 X Window System is a trademark of The Open Group */
 
-/* $RCSId: $ */
-
 /*
  * Author:
  *   Pontus Lidman <pontus.lidman@nokia.com>
diff --git a/hw/kdrive/i810/i810_cursor.c b/hw/kdrive/i810/i810_cursor.c
index cf4f717f2..434fc4087 100644
--- a/hw/kdrive/i810/i810_cursor.c
+++ b/hw/kdrive/i810/i810_cursor.c
@@ -58,10 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
-
-
-/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_cursor.c,v 1.2 2001/12/10 16:34:20 keithp Exp $ */
-
 /* i810_cursor.c: KDrive hardware cursor routines for the i810 chipset */
 
 /*
diff --git a/hw/kdrive/i810/i810_reg.h b/hw/kdrive/i810/i810_reg.h
index e6648a1de..d9f4c8f48 100644
--- a/hw/kdrive/i810/i810_reg.h
+++ b/hw/kdrive/i810/i810_reg.h
@@ -57,7 +57,6 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $RCSId: xc/programs/Xserver/hw/kdrive/i810/i810_reg.h,v 1.1 2001/03/30 02:18:41 keithp Exp $ */
 
 /*
  * Authors:
diff --git a/hw/kdrive/i810/i810stub.c b/hw/kdrive/i810/i810stub.c
index 364d16bfe..3109984e0 100644
--- a/hw/kdrive/i810/i810stub.c
+++ b/hw/kdrive/i810/i810stub.c
@@ -1,4 +1,3 @@
-/* $RCSId: $ */
 /* COPYRIGHT AND PERMISSION NOTICE
 
 Copyright (c) 2000, 2001 Nokia Home Communications