From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Sun, 18 May 2008 18:47:19 +0000 (+0200)
Subject: m68k: Q40/Q60 floppy support is broken
X-Git-Tag: v2.6.26-rc3~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3f20a4ef57f4cbe8e2bbdb12640548795b32c6f7;p=linux-2.6-omap-h63xx.git

m68k: Q40/Q60 floppy support is broken

Mark Q40/Q60 floppy support broken:

    arch/m68k/q40/q40ints.c: In function 'q40_irq_handler':
    arch/m68k/q40/q40ints.c:214: error: implicit declaration of function 'floppy_hardint'

Including <asm/floppy.h> doesn't help, as it causes a lot of additional error
messages (cfr. Sun 3x).

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 6649346f7dd..55ea52fe6ac 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -44,7 +44,7 @@ config GENERIC_IOMAP
 
 config ARCH_MAY_HAVE_PC_FDC
 	bool
-	depends on Q40 || (BROKEN && SUN3X)
+	depends on BROKEN && (Q40 || SUN3X)
 	default y
 
 config NO_IOPORT