Merge hardwired.(none):/mnt/stuff/backups/src/kernel/2.6/trees/bk-linus

into hardwired.(none):/mnt/stuff/backups/src/kernel/2.6/trees/agpgart

arch/x86_64/kernel/pci-gart.c

@@ -76,7 +76,6 @@ static u32 northbridge_flush_word[NR_CPUS + 1];
 #define EMERGENCY_PAGES 32 /* = 128KB */ 
 
 #ifdef CONFIG_AGP
-extern int agp_init(void);
 #define AGPEXTERN extern
 #else
 #define AGPEXTERN

drivers/char/agp/Kconfig

@@ -80,8 +80,8 @@ config AGP_INTEL
 	tristate "Intel 440LX/BX/GX, I8xx and E7x05 chipset support"
 	depends on AGP && X86 && !X86_64
 	help
-	  This option gives you AGP support for the GLX component of
-	  XFree86 4.x on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860
+	  This option gives you AGP support for the GLX component of XFree86 4.x
+	  on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860, 875,
 	  E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,
 	  852GM, 855GM and 865G integrated graphics chipsets.
 

drivers/char/agp/amd64-agp.c

@@ -495,7 +495,7 @@ int __init agp_amd64_init(void)
 	int err = 0;
 	if (agp_off)
 		return -EINVAL;
-	if (pci_module_init(&agp_amd64_pci_driver) == 0) { 
+	if (pci_module_init(&agp_amd64_pci_driver) > 0) { 
 		struct pci_dev *dev;
 		if (!agp_try_unsupported && !agp_try_unsupported_boot) { 
 			printk(KERN_INFO "No supported AGP bridge found.\n");

drivers/char/agp/ati-agp.c

@@ -226,8 +226,6 @@ static int ati_configure(void)
 	OUTREG32(ati_generic_private.registers, ATI_GART_BASE,
 		 agp_bridge->gatt_bus_addr);
 
-	/* Flush the tlb */
-	OUTREG32(ati_generic_private.registers, ATI_GART_CACHE_CNTRL, 1);
 	return 0;
 }