drivers/char/agp/intel-agp.o(.data+0x2e0): In function `intel_i810_remove_entries':
drivers/char/agp/intel-agp.c:201: multiple definition of `intel_830_driver'
drivers/char/agp/ia32e-agp.o(.data+0xc0):drivers/char/agp/ia32e-agp.c:75: first defined here
drivers/char/agp/intel-agp.o(.data+0x460): In function `intel_i830_init_gtt_entries':                                                                           drivers/char/agp/intel-agp.c:303: multiple definition of `intel_845_driver'
drivers/char/agp/ia32e-agp.o(.data+0x120):drivers/char/agp/ia32e-agp.c:103: first defined here
drivers/char/agp/intel-agp.o(.data+0x520): In function `intel_i830_init_gtt_entries':                                                                           drivers/char/agp/intel-agp.c:349: multiple definition of `intel_860_driver'
drivers/char/agp/ia32e-agp.o(.data+0x180):drivers/char/agp/ia32e-agp.c:114: first defined here



---

 25-akpm/drivers/char/agp/ia32e-agp.c |    6 +++---
 25-akpm/drivers/char/agp/intel-agp.c |   24 +++++++++++-------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff -puN drivers/char/agp/ia32e-agp.c~agp-build-fix drivers/char/agp/ia32e-agp.c
--- 25/drivers/char/agp/ia32e-agp.c~agp-build-fix	2004-03-21 00:52:03.830765592 -0800
+++ 25-akpm/drivers/char/agp/ia32e-agp.c	2004-03-21 00:55:42.590509056 -0800
@@ -447,7 +447,7 @@ static struct aper_size_info_8 intel_8xx
 	{4, 1024, 0, 63}
 };
 
-struct agp_bridge_driver intel_830_driver = {
+static struct agp_bridge_driver intel_830_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_i830_sizes,
 	.size_type		= FIXED_APER_SIZE,
@@ -471,7 +471,7 @@ struct agp_bridge_driver intel_830_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_845_driver = {
+static struct agp_bridge_driver intel_845_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -495,7 +495,7 @@ struct agp_bridge_driver intel_845_drive
 };
 
 
-struct agp_bridge_driver intel_860_driver = {
+static struct agp_bridge_driver intel_860_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
diff -puN drivers/char/agp/intel-agp.c~agp-build-fix drivers/char/agp/intel-agp.c
--- 25/drivers/char/agp/intel-agp.c~agp-build-fix	2004-03-21 00:52:03.847763008 -0800
+++ 25-akpm/drivers/char/agp/intel-agp.c	2004-03-21 00:56:30.228267016 -0800
@@ -967,7 +967,7 @@ static struct aper_size_info_8 intel_830
 	{32, 8192, 3, 56}
 };
 
-struct agp_bridge_driver intel_generic_driver = {
+static struct agp_bridge_driver intel_generic_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_generic_sizes,
 	.size_type		= U16_APER_SIZE,
@@ -990,7 +990,7 @@ struct agp_bridge_driver intel_generic_d
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_810_driver = {
+static struct agp_bridge_driver intel_810_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_i810_sizes,
 	.size_type		= FIXED_APER_SIZE,
@@ -1014,8 +1014,7 @@ struct agp_bridge_driver intel_810_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-
-struct agp_bridge_driver intel_815_driver = {
+static struct agp_bridge_driver intel_815_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_815_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1038,7 +1037,7 @@ struct agp_bridge_driver intel_815_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_830_driver = {
+static struct agp_bridge_driver intel_830_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_i830_sizes,
 	.size_type		= FIXED_APER_SIZE,
@@ -1062,8 +1061,7 @@ struct agp_bridge_driver intel_830_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-
-struct agp_bridge_driver intel_820_driver = {
+static struct agp_bridge_driver intel_820_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1086,7 +1084,7 @@ struct agp_bridge_driver intel_820_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_830mp_driver = {
+static struct agp_bridge_driver intel_830mp_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_830mp_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1109,7 +1107,7 @@ struct agp_bridge_driver intel_830mp_dri
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_840_driver = {
+static struct agp_bridge_driver intel_840_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1132,7 +1130,7 @@ struct agp_bridge_driver intel_840_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_845_driver = {
+static struct agp_bridge_driver intel_845_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1155,7 +1153,7 @@ struct agp_bridge_driver intel_845_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_850_driver = {
+static struct agp_bridge_driver intel_850_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1178,7 +1176,7 @@ struct agp_bridge_driver intel_850_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_860_driver = {
+static struct agp_bridge_driver intel_860_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,
@@ -1201,7 +1199,7 @@ struct agp_bridge_driver intel_860_drive
 	.agp_destroy_page	= agp_generic_destroy_page,
 };
 
-struct agp_bridge_driver intel_7505_driver = {
+static struct agp_bridge_driver intel_7505_driver = {
 	.owner			= THIS_MODULE,
 	.aperture_sizes		= intel_8xx_sizes,
 	.size_type		= U8_APER_SIZE,

_