[AGPGART] more kconfig cleanups

- Alphabetical order of items.
- Fixup the IOMMU dependancy problem (Roman Zippel)
- Word all options similarly (Add 'chipset' to some descriptions)
- Remove unused CONFIG_AGP_GART
- Fix up incomplete alpha tristate

drivers/char/agp/Kconfig

 config AGP
 	tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
-	default AGP_GART if GART_IOMMU
+	default y if GART_IOMMU
 	---help---
 	  AGP (Accelerated Graphics Port) is a bus system mainly used to
 	  connect graphics cards to the rest of the system.
@@ -25,53 +25,65 @@ config AGP
 	  a module, say M here and read <file:Documentation/modules.txt>.  The
 	  module will be called agpgart.
 
-config AGP_GART
-	bool "/dev/agpgart (AGP Support)"
-	depends on GART_IOMMU
-
-config AGP_INTEL
-	tristate "Intel 440LX/BX/GX, I8xx and E7x05 support"
+config AGP_ALI
+	tristate "ALI chipset support"
 	depends on AGP && X86 && !X86_64
-	help
+	---help---
 	  This option gives you AGP support for the GLX component of the
-	  XFree86 4.x on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860
-	  E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,
-	  852GM, 855GM and 865G integrated graphics chipsets.
+	  XFree86 4.x on the following ALi chipsets.  The supported chipsets
+	  include M1541, M1621, M1631, M1632, M1641,M1647,and M1651.
+	  For the ALi-chipset question, ALi suggests you refer to
+	  <http://www.ali.com.tw/eng/support/index.shtml>.
 
-	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-	  use GLX or DRI, or if you have any Intel integrated graphics
-	  chipsets.  If unsure, say Y.
+	  The M1541 chipset can do AGP 1x and 2x, but note that there is an
+	  acknowledged incompatibility with Matrox G200 cards. Due to
+	  timing issues, this chipset cannot do AGP 2x with the G200.
+	  This is a hardware limitation. AGP 1x seems to be fine, though.
 
-#config AGP_I810
-#	tristate "Intel I810/I815/I830M (on-board) support"
-#	depends on AGP && X86 && !X86_64
-#	help
-#	  This option gives you AGP support for the Xserver on the Intel 810
-#	  815 and 830m chipset boards for their on-board integrated graphics. This
-#	  is required to do any useful video modes with these boards.
+	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
+	  use GLX or DRI.  If unsure, say N.
 
-config AGP_VIA
-	tristate "VIA chipset support"
+config AGP_AMD
+	tristate "AMD Irongate, 761, and 762 chipset support"
 	depends on AGP && X86 && !X86_64
 	help
 	  This option gives you AGP support for the GLX component of the
-	  XFree86 4.x on VIA MPV3/Apollo Pro chipsets.
+	  XFree86 4.x on AMD Irongate, 761, and 762 chipsets.
 
 	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
 	  use GLX or DRI.  If unsure, say N.
 
-config AGP_AMD
-	tristate "AMD Irongate, 761, and 762 support"
+config AGP_AMD_8151
+	tristate "AMD 8151 chipset support"
+	depends on AGP && X86
+	default GART_IOMMU
+	help
+	  Say Y here to support the AMD 8151 AGP bridge and the builtin
+	  GART on the AMD Athlon64/Opteron ("Hammer") CPUs.
+
+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 the
-	  XFree86 4.x on AMD Irongate, 761, and 762 chipsets.
+	  XFree86 4.x on Intel 440LX/BX/GX, 815, 820, 830, 840, 845, 850, 860
+	  E7205 and E7505 chipsets and full support for the 810, 815, 830M, 845G,
+	  852GM, 855GM and 865G integrated graphics chipsets.
 
 	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-	  use GLX or DRI.  If unsure, say N.
+	  use GLX or DRI, or if you have any Intel integrated graphics
+	  chipsets.  If unsure, say Y.
+
+config AGP_NVIDIA
+	tristate "NVIDIA nForce/nForce2 chipset support"
+	depends on AGP && X86 && !X86_64
+	help
+	  This option gives you AGP support for the GLX component of the
+	  XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets
+	  include nForce and nForce2
 
 config AGP_SIS
-	tristate "Generic SiS support"
+	tristate "SiS chipset support"
 	depends on AGP && X86 && !X86_64
 	help
 	  This option gives you AGP support for the GLX component of the "soon
@@ -83,63 +95,39 @@ config AGP_SIS
 	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
 	  use GLX or DRI.  If unsure, say N.
 
-config AGP_ALI
-	tristate "ALI chipset support"
-	depends on AGP && X86 && !X86_64
-	---help---
-	  This option gives you AGP support for the GLX component of the
-	  XFree86 4.x on the following ALi chipsets.  The supported chipsets
-	  include M1541, M1621, M1631, M1632, M1641,M1647,and M1651.
-	  For the ALi-chipset question, ALi suggests you refer to
-	  <http://www.ali.com.tw/eng/support/index.shtml>.
-
-	  The M1541 chipset can do AGP 1x and 2x, but note that there is an
-	  acknowledged incompatibility with Matrox G200 cards. Due to
-	  timing issues, this chipset cannot do AGP 2x with the G200.
-	  This is a hardware limitation. AGP 1x seems to be fine, though.
-
-	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
-	  use GLX or DRI.  If unsure, say N.
-
 config AGP_SWORKS
-	tristate "Serverworks LE/HE support"
+	tristate "Serverworks LE/HE chipset support"
 	depends on AGP && X86 && !X86_64
 	help
 	  Say Y here to support the Serverworks AGP card.  See 
 	  <http://www.serverworks.com/> for product descriptions and images.
 
-config AGP_NVIDIA
-	tristate "NVIDIA nForce/nForce2 chipset support"
+config AGP_VIA
+	tristate "VIA chipset support"
 	depends on AGP && X86 && !X86_64
 	help
 	  This option gives you AGP support for the GLX component of the
-	  XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets
-	  include nForce and nForce2
+	  XFree86 4.x on VIA MPV3/Apollo Pro chipsets.
 
-config AGP_AMD_8151
-	tristate "AMD 8151 support"
-	depends on AGP && X86
-	default GART_IOMMU
-	help
-	  Say Y here to support the AMD 8151 AGP bridge and the builtin
-	  GART on the AMD Athlon64/Opteron ("Hammer") CPUs.
+	  You should say Y here if you use XFree86 3.3.6 or 4.x and want to
+	  use GLX or DRI.  If unsure, say N.
 
 config AGP_I460
-	tristate "Intel 460GX support"
+	tristate "Intel 460GX chipset support"
 	depends on AGP && IA64
 	help
 	  This option gives you AGP GART support for the Intel 460GX chipset
 	  for IA64 processors.
 
 config AGP_HP_ZX1
-	tristate "HP ZX1 AGP support"
+	tristate "HP ZX1 chipset AGP support"
 	depends on AGP && IA64
 	help
 	  This option gives you AGP GART support for the HP ZX1 chipset
 	  for IA64 processors.
 
 config AGP_ALPHA_CORE
-	tristate
+	tristate "Alpha AGP support"
 	depends on AGP && (ALPHA_GENERIC || ALPHA_TITAN || ALPHA_MARVEL)
 	default AGP