Index: intelfb/Makefile.kernel
diff -u intelfb/Makefile.kernel:1.2 intelfb/Makefile.kernel:1.3
--- intelfb/Makefile.kernel:1.2	Tue Feb  4 18:55:49 2003
+++ intelfb/Makefile.kernel	Fri Jun 27 11:00:56 2003
@@ -1,9 +1,10 @@
-# $DHD: intelfb/Makefile.kernel,v 1.2 2003/02/04 23:55:49 dawes Exp $
+# $DHD: intelfb/Makefile.kernel,v 1.3 2003/06/27 15:00:56 dawes Exp $
 # $TG$
 
 O_TARGET := intelfb.o
 
-obj-$(CONFIG_FB_INTEL)	+= intelfbdrv.o intelfbhw.o
+obj-y := intelfbdrv.o intelfbhw.o
+obj-m := $(O_TARGET)
 
 include $(TOPDIR)/Rules.make
 
Index: intelfb/clock.c
diff -u intelfb/clock.c:1.1 intelfb/clock.c:1.2
--- intelfb/clock.c:1.1	Mon Jan  6 17:56:36 2003
+++ intelfb/clock.c	Fri Jun 13 10:22:26 2003
@@ -1,12 +1,12 @@
 /*
  * Test program to calculate Intel 8xx clock parameters.
  *
- * Copyright © 2003 David Dawes <dawes@tungstengraphics.com>
+ * Copyright © 2003 David Dawes <dawes@xfree86.org>
  *
  * Author: David Dawes
  */
 
-/* $DHD: intelfb/clock.c,v 1.1 2003/01/06 22:56:36 dawes Exp $ */
+/* $DHD: intelfb/clock.c,v 1.2 2003/06/13 14:22:26 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
Index: intelfb/fbtest.c
diff -u intelfb/fbtest.c:1.6 intelfb/fbtest.c:1.8
--- intelfb/fbtest.c:1.6	Mon Feb  3 17:34:10 2003
+++ intelfb/fbtest.c	Fri Jun 27 11:06:25 2003
@@ -2,7 +2,7 @@
  * Basic test program for fbdev interfaces.
  *
  * Portions Copyright © 1999-2002 The XFree86 Project, Inc.
- * Copyright © 2003 David Dawes <dawes@tungstengraphics.com>
+ * Copyright © 2003 David Dawes <dawes@xfree86.org>
  *
  * Author: David Dawes
  *
@@ -10,8 +10,7 @@
  * standard XFree86 license.
  */
 
-/* $DHD: intelfb/fbtest.c,v 1.6 2003/02/03 22:34:10 dawes Exp $ */
-/* $TG$ */
+/* $DHD: intelfb/fbtest.c,v 1.8 2003/06/27 15:06:25 dawes Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
Index: intelfb/intelfb.h
diff -u intelfb/intelfb.h:1.39 intelfb/intelfb.h:1.40
--- intelfb/intelfb.h:1.39	Tue Apr 29 21:38:39 2003
+++ intelfb/intelfb.h	Fri Jun 27 11:06:25 2003
@@ -1,12 +1,11 @@
 #ifndef _INTELFB_H
 #define _INTELFB_H
 
-/* $DHD: intelfb/intelfb.h,v 1.39 2003/04/30 01:38:39 dawes Exp $ */
-/* $TG$ */
+/* $DHD: intelfb/intelfb.h,v 1.40 2003/06/27 15:06:25 dawes Exp $ */
 
 
 /*** Version/name ***/
-#define INTELFB_VERSION			"0.7.6"
+#define INTELFB_VERSION			"0.7.7"
 #define INTELFB_MODULE_NAME		"intelfb"
 #define SUPPORTED_CHIPSETS		"830M/845G/852GM/855GM/865G"
 
Index: intelfb/intelfbdrv.c
diff -u intelfb/intelfbdrv.c:1.17 intelfb/intelfbdrv.c:1.20
--- intelfb/intelfbdrv.c:1.17	Tue Apr 29 21:40:14 2003
+++ intelfb/intelfbdrv.c	Fri Jun 27 11:17:40 2003
@@ -4,7 +4,7 @@
  * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G
  * integrated graphics chips.
  *
- * Copyright © 2002, 2003 David Dawes <dawes@tungstengraphics.com>
+ * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
  *
  * This driver consists of two parts.  The first part (intelfbdrv.c) provides
  * the basic fbdev interfaces, is derived in part from the radeonfb and
@@ -17,8 +17,7 @@
  *
  */
 
-/* $DHD: intelfb/intelfbdrv.c,v 1.17 2003/04/30 01:40:14 dawes Exp $ */
-/* $TG$ */
+/* $DHD: intelfb/intelfbdrv.c,v 1.20 2003/06/27 15:17:40 dawes Exp $ */
 
 /*
  * Changes:
@@ -80,6 +79,10 @@
  *    04/2003 - Version 0.7.6: Fix typo that affects builds with SMP-enabled
  *		kernels.  (David Dawes, reported by Anupam).
  *
+ *    06/2003 - Version 0.7.7:
+ *              Fix Makefile.kernel build problem (Tsutomu Yasuda).
+ *		Fix mis-placed #endif (2.4.21 kernel).
+ *
  * TODO:
  *  - 
  *
@@ -1624,8 +1627,8 @@
 					       (green & 0xff00) |
 					       ((blue  & 0xff00) >> 8);
 		break;
-	}
 #endif
+	}
 	return 0;
 }
 
Index: intelfb/intelfbhw.c
diff -u intelfb/intelfbhw.c:1.7 intelfb/intelfbhw.c:1.9
--- intelfb/intelfbhw.c:1.7	Wed Feb  5 19:53:11 2003
+++ intelfb/intelfbhw.c	Fri Jun 27 11:06:25 2003
@@ -3,7 +3,7 @@
  *
  * Linux framebuffer driver for Intel(R) 865G integrated graphics chips.
  *
- * Copyright © 2002, 2003 David Dawes <dawes@tungstengraphics.com>
+ * Copyright © 2002, 2003 David Dawes <dawes@xfree86.org>
  *
  * This driver consists of two parts.  The first part (intelfbdrv.c) provides
  * the basic fbdev interfaces, is derived in part from the radeonfb and
@@ -16,8 +16,7 @@
  *
  */
 
-/* $DHD: intelfb/intelfbhw.c,v 1.7 2003/02/06 00:53:11 dawes Exp $ */
-/* $TG$ */
+/* $DHD: intelfb/intelfbhw.c,v 1.9 2003/06/27 15:06:25 dawes Exp $ */
 
 #include <linux/config.h>
 #include <linux/module.h>
Index: intelfb/intelfbhw.h
diff -u intelfb/intelfbhw.h:1.4 intelfb/intelfbhw.h:1.5
--- intelfb/intelfbhw.h:1.4	Tue Apr 29 21:37:55 2003
+++ intelfb/intelfbhw.h	Fri Jun 27 11:06:25 2003
@@ -1,8 +1,7 @@
 #ifndef _INTELFBHW_H
 #define _INTELFBHW_H
 
-/* $DHD: intelfb/intelfbhw.h,v 1.4 2003/04/30 01:37:55 dawes Exp $ */
-/* $TG$ */
+/* $DHD: intelfb/intelfbhw.h,v 1.5 2003/06/27 15:06:25 dawes Exp $ */
 
 
 /*** HW-specific data ***/