Make CONFIG_ARP=m under x86_64

[Jan Engelhardt]

The way it is written, CONFIG_AGP is always y for x86_64 - not so nice 
when you want to use nvagp instead which requries agpgart to be 
unloadable.

Signed-off-by: Jan Engelhardt <jengelh@xxxxxxxxxxxxxxx>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6c70fed..1b2ce6c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -429,12 +429,17 @@ config HPET_EMULATE_RTC
 	def_bool y
 	depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
 
+config GART_IOMMU
+	bool
+
+# Hack to make AGP selectable as module
+config GART_IOMMU_SELECTOR
 # Mark as embedded because too many people got it wrong.
 # The code disables itself when not needed.
-config GART_IOMMU
-	bool "GART IOMMU support" if EMBEDDED
-	default y
+	tristate "GART IOMMU support" if EMBEDDED
+	default m
 	select SWIOTLB
+	select GART_IOMMU_BASE
 	select AGP
 	depends on X86_64 && PCI
 	help

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/