summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2011-03-22 16:34:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-22 17:44:16 -0700
commit8df3bd9e18cdc3539edea550be34605a240e15d4 (patch)
treefe3790debdf27754802dc6663b762a679b22525a
parent4061d68e1a59ffacdf216a55f254cb01d4d1f840 (diff)
downloadlinux-3.10-8df3bd9e18cdc3539edea550be34605a240e15d4.tar.gz
linux-3.10-8df3bd9e18cdc3539edea550be34605a240e15d4.tar.bz2
linux-3.10-8df3bd9e18cdc3539edea550be34605a240e15d4.zip
x86: only compile floppy driver if CONFIG_ISA_DMA_API is enabled
The generic floppy disk driver utilizies the interface provided by CONFIG_ISA_DMA_API, specifically claim_dma_lock(), release_dma_lock(), request_dma(), and free_dma(). Thus, there's a strict dependency on the config option and the driver should only be loaded if the kernel supports ISA-style DMA. Signed-off-by: David Rientjes <rientjes@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Bjorn Helgaas <bjorn.helgaas@hp.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e1f65c46bc9..720206f46d0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -143,7 +143,7 @@ config GENERIC_GPIO
bool
config ARCH_MAY_HAVE_PC_FDC
- def_bool y
+ def_bool ISA_DMA_API
config RWSEM_GENERIC_SPINLOCK
def_bool !X86_XADD