diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-06-26 16:35:44 +0100 |
commit | 62ed948cb1405fe95d61d8c6445c102e0c9da0a6 (patch) | |
tree | f139adcc861a05e7cc09cdb387a271a652fc2d07 /drivers/char/agp/Kconfig | |
parent | 17ffc7ba6d7ea68b8d5f55a5ca1b87163e69720d (diff) | |
parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
download | kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.gz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.tar.xz kernel-crypto-62ed948cb1405fe95d61d8c6445c102e0c9da0a6.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/agp/Kconfig')
-rw-r--r-- | drivers/char/agp/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig index 7c88c060a9e..46685a54077 100644 --- a/drivers/char/agp/Kconfig +++ b/drivers/char/agp/Kconfig @@ -1,7 +1,6 @@ config AGP - tristate "/dev/agpgart (AGP Support)" if !GART_IOMMU + tristate "/dev/agpgart (AGP Support)" depends on ALPHA || IA64 || PPC || X86 - 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. |