Merge tetrachloride.(none):/mnt/stuff/kernel/2.5/bk-linus

into tetrachloride.(none):/mnt/stuff/kernel/2.5/agpgart

drivers/char/agp/intel-agp.c

@@ -1253,12 +1253,6 @@ struct agp_device_ids intel_agp_device_ids[] __initdata =
 		.chipset_name	= "i830M",
 		.chipset_setup	= intel_830mp_setup
 	},
-	{
-		.device_id	= PCI_DEVICE_ID_INTEL_82845G_HB,
-		.chipset	= INTEL_I845_G,
-		.chipset_name	= "i845G",
-		.chipset_setup	= intel_830mp_setup
-	},
 	{
 		.device_id	= PCI_DEVICE_ID_INTEL_82840_HB,
 		.chipset	= INTEL_I840,
@@ -1271,6 +1265,12 @@ struct agp_device_ids intel_agp_device_ids[] __initdata =
 		.chipset_name	= "i845",
 		.chipset_setup	= intel_845_setup
 	},
+	{
+		.device_id	= PCI_DEVICE_ID_INTEL_82845G_HB,
+		.chipset	= INTEL_I845_G,
+		.chipset_name	= "i845G",
+		.chipset_setup	= intel_845_setup
+	},
 	{
 		.device_id	= PCI_DEVICE_ID_INTEL_82850_HB,
 		.chipset	= INTEL_I850,

drivers/char/agp/via-agp.c

@@ -124,7 +124,7 @@ static int __init via_generic_setup (struct pci_dev *pdev)
 	return 0;
 }
 
-
+#ifdef CONFIG_AGP3
 /*
  * The KT400 does magick to put the AGP bridge compliant with the same
  * standards version as the graphics card. If we haven't fallen into
@@ -137,6 +137,7 @@ static void __init via_kt400_enable(u32 mode)
 		/* Something weird happened, fall back to 2.0 */
 		agp_generic_agp_enable(mode);
 }
+#endif
 
 static int __init via_kt400_setup(struct pci_dev *pdev)
 {
@@ -173,9 +174,13 @@ static int __init via_kt400_setup(struct pci_dev *pdev)
 		agp_bridge.agp_enable = agp_generic_agp_enable;
 
 	} else {
-
+#ifdef CONFIG_AGP3
 		/* AGP 3.0 mode */
 		agp_bridge.agp_enable = via_kt400_enable;
+#else
+		printk ("AGP: VIA KT400 in AGP3.0 mode support not compiled in.\n");
+		return -ENODEV;
+#endif
 	}
 	return 0;
 }