Return-Path: Received: from mnm [127.0.0.1] by localhost with POP3 (fetchmail-5.9.0) for akpm@localhost (single-drop); Thu, 01 Jan 2004 12:12:29 -0800 (PST) Received: from fire-1.osdl.org (air1.pdx.osdl.net [172.20.0.5]) by mail.osdl.org (8.11.6/8.11.6) with ESMTP id i01KANM13664; Thu, 1 Jan 2004 12:10:23 -0800 Received: from amsfep15-int.chello.nl (amsfep15-int.chello.nl [213.46.243.28]) by fire-1.osdl.org (8.12.8/8.12.8) with ESMTP id i01KALN2013462; Thu, 1 Jan 2004 12:10:22 -0800 Received: from callisto.of.borg ([195.162.221.57]) by amsfep15-int.chello.nl (InterMail vM.6.00.05.02 201-2115-109-103-20031105) with ESMTP id <20040101201016.GIYW3882.amsfep15-int.chello.nl@callisto.of.borg>; Thu, 1 Jan 2004 21:10:16 +0100 Received: from callisto.of.borg (geert@localhost [127.0.0.1]) by callisto.of.borg (8.12.9/8.12.9/Debian-5) with ESMTP id i01K1kVR031674; Thu, 1 Jan 2004 21:01:46 +0100 Received: (from geert@localhost) by callisto.of.borg (8.12.9/8.12.9/Debian-5) id i01K1iUK031672; Thu, 1 Jan 2004 21:01:45 +0100 Date: Thu, 1 Jan 2004 21:01:45 +0100 Message-Id: <200401012001.i01K1iUK031672@callisto.of.borg> From: Geert Uytterhoeven To: Linus Torvalds , Andrew Morton Cc: Linux Kernel Development , Geert Uytterhoeven Subject: [PATCH 339] M68k floppy selection X-MIMEDefang-Filter: osdl$Revision: 1.45 $ X-Scanned-By: MIMEDefang 2.36 X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on mnm X-Spam-Level: X-Spam-Status: No, hits=-4.9 required=2.0 tests=BAYES_00 autolearn=ham version=2.60 Floppy: On m68k, PC-style floppies are used on Q40/Q60 and Sun-3x only. Sun-3x floppy is currently broken (needs I/O abstractions) --- linux-2.6.0/drivers/block/Kconfig Thu Oct 9 10:02:38 2003 +++ linux-m68k-2.6.0/drivers/block/Kconfig Thu Oct 9 17:38:53 2003 @@ -6,7 +6,7 @@ config BLK_DEV_FD tristate "Normal floppy disk support" - depends on !X86_PC9800 && !ARCH_S390 + depends on (!X86_PC9800 && !ARCH_S390 && !M68K) || Q40 || (SUN3X && BROKEN) ---help--- If you want to use the floppy disk drive(s) of your PC under Linux, say Y. Information about this driver, especially important for IBM Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds