From c8ac8050a5b5aae1c00b8d8c6667490426ab5435 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@codemonkey.org.uk>
Date: Thu, 10 Apr 2003 03:15:13 +0100
Subject: [PATCH] [AGPGART] Remove CONFIG_AGP3. This optioned saved just a
 handful of bytes, and uglied up the code quite a lot. Saving less than a page
 of memory is not as important as maintainable code.

---
 drivers/char/agp/Kconfig   |  4 ----
 drivers/char/agp/Makefile  |  3 +--
 drivers/char/agp/generic.c |  2 --
 drivers/char/agp/via-agp.c | 10 ----------
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index fa9baf5309436..b95a7714a25db 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -29,10 +29,6 @@ config AGP_GART
 	bool "/dev/agpgart (AGP Support)"
 	depends on GART_IOMMU
 
-config AGP3
-	bool "AGP 3.0 compliance (EXPERIMENTAL)"
-	depends on AGP
-
 config AGP_INTEL
 	tristate "Intel 440LX/BX/GX, I8xx and E7x05 support"
 	depends on AGP
diff --git a/drivers/char/agp/Makefile b/drivers/char/agp/Makefile
index 150bc6c6bdd10..585d2c4ab7ad2 100644
--- a/drivers/char/agp/Makefile
+++ b/drivers/char/agp/Makefile
@@ -3,8 +3,7 @@
 # space ioctl interface to use agp memory.  It also adds a kernel interface
 # that other drivers could use to manipulate agp memory.
 
-agpgart-y := backend.o frontend.o generic.o
-agpgart-$(CONFIG_AGP3) += generic-3.0.o
+agpgart-y := backend.o frontend.o generic.o generic-3.0.o
 agpgart-objs := $(agpgart-y)
 obj-$(CONFIG_AGP) += agpgart.o
 
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c
index 8c0b404bb31ec..21d21e221dbad 100644
--- a/drivers/char/agp/generic.c
+++ b/drivers/char/agp/generic.c
@@ -402,7 +402,6 @@ void agp_generic_enable(u32 mode)
 	minor = (ncapid >> 16) & 0xf;
 	printk(KERN_INFO PFX "Found an AGP %d.%d compliant device.\n",major, minor);
 
-#ifdef CONFIG_AGP3
 	if(major >= 3) {
 		u32 agp_3_0;
 
@@ -415,7 +414,6 @@ void agp_generic_enable(u32 mode)
 			printk (KERN_INFO PFX "not in AGP 3.0 mode, falling back to 2.x\n");
 		}
 	}
-#endif
 
 	/* AGP v<3 */
 	pci_read_config_dword(agp_bridge->dev,
diff --git a/drivers/char/agp/via-agp.c b/drivers/char/agp/via-agp.c
index 4558681e56612..ce67b25e83ef5 100644
--- a/drivers/char/agp/via-agp.c
+++ b/drivers/char/agp/via-agp.c
@@ -101,7 +101,6 @@ static struct gatt_mask via_generic_masks[] =
 };
 
 
-#ifdef CONFIG_AGP3
 static int via_fetch_size_agp3(void)
 {
 	int i;
@@ -206,18 +205,10 @@ static int __init via_generic_agp3_setup (struct pci_dev *pdev)
 	agp_bridge->cant_use_aperture = 0;
 	return 0;
 }
-#else
-static int __init via_generic_agp3_setup (struct pci_dev *pdev)
-{
-	printk (KERN_INFO PFX "Bridge in AGP3 mode, but CONFIG_AGP3=n\n");
-	return -ENODEV;
-}
-#endif	/* CONFIG_AGP3 */
 
 
 static int __init via_generic_setup (struct pci_dev *pdev)
 {
-#ifdef CONFIG_AGP3
 	/* Garg, there are KT400s with KT266 IDs. */
 	if (pdev->device == PCI_DEVICE_ID_VIA_8367_0) {
 
@@ -235,7 +226,6 @@ static int __init via_generic_setup (struct pci_dev *pdev)
 			/* Its in 2.0 mode, drop through. */
 		}
 	}
-#endif
 
 	agp_bridge->masks = via_generic_masks;
 	agp_bridge->aperture_sizes = (void *) via_generic_sizes;
-- 
2.53.0