Merge bk://linux-dj.bkbits.net/agpgart

into home.transmeta.com:/home/torvalds/v2.5/linux

drivers/char/agp/amd-k8-agp.c

@@ -2,7 +2,7 @@
  * Copyright 2001-2003 SuSE Labs.
  * Distributed under the GNU public license, v2.
  * 
- * This is a GART driver for the AMD64 on-CPU northbridge.
+ * This is a GART driver for the AMD Opteron/Athlon64 on-CPU northbridge.
  * It also includes support for the AMD 8151 AGP bridge,
  * although it doesn't actually do much, as all the real
  * work is done in the northbridge(s).
@@ -340,7 +340,7 @@ static int __init agp_amdk8_probe (struct pci_dev *dev, const struct pci_device_
 	if (cap_ptr == 0)
 		return -ENODEV;
 
-	printk (KERN_INFO PFX "Detected AMD64 on-CPU GART\n");
+	printk (KERN_INFO PFX "Detected Opteron/Athlon64 on-CPU GART\n");
 
 	agp_bridge->dev = dev;
 	agp_bridge->capndx = cap_ptr;

drivers/char/drm/drm_agpsupport.h

@@ -266,12 +266,6 @@ drm_agp_head_t *DRM(agp_init)(void)
 		head->cant_use_aperture = head->agp_info.cant_use_aperture;
 		head->page_mask = head->agp_info.page_mask;
 #endif
-
-		DRM_INFO("AGP %d.%d aperture @ 0x%08lx %ZuMB\n",
-			 head->agp_info.version.major,
-			 head->agp_info.version.minor,
-			 head->agp_info.aper_base,
-			 head->agp_info.aper_size);
 	}
 	return head;
 }