From: Dave Jones <davej@redhat.com>
Date: Thu, 29 Jun 2006 20:01:54 +0000 (-0400)
Subject: Merge ../linus
X-Git-Tag: v2.6.18-rc1~352^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=55b4d6a52195a8f277ffddf755ddaff359878f41;p=platform%2Fkernel%2Flinux-3.10.git

Merge ../linus

Conflicts:

	drivers/char/agp/Kconfig
---

55b4d6a52195a8f277ffddf755ddaff359878f41
diff --cc drivers/char/agp/Kconfig
index 3dbbb95,9826a39..22f8cf2
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@@ -1,8 -1,6 +1,7 @@@
  config AGP
- 	tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU
+ 	tristate "/dev/agpgart (AGP Support)"
  	depends on ALPHA || IA64 || PPC || X86
 +	depends on PCI
- 	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.