Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261963AbVDKWSW (ORCPT ); Mon, 11 Apr 2005 18:18:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261959AbVDKWQn (ORCPT ); Mon, 11 Apr 2005 18:16:43 -0400 Received: from caramon.arm.linux.org.uk ([212.18.232.186]:32274 "EHLO caramon.arm.linux.org.uk") by vger.kernel.org with ESMTP id S261963AbVDKWP0 (ORCPT ); Mon, 11 Apr 2005 18:15:26 -0400 From: Russell King To: Andrew Morton CC: LKML Subject: [PATCH] Fix floppy disk dependencies X-Patch-Ref: 01-fixes/03-blk_dev_fd-depends Message-Id: Date: Mon, 11 Apr 2005 23:15:20 +0100 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1116 Lines: 24 Both the RiscPC and (optionally) EBSA285 have floppy disk support. Allow this option to be selected on these ARM platforms again. Signed-off-by: Russell King diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x '*.orig' -x '*.rej' -r orig/drivers/block/Kconfig linux/drivers/block/Kconfig --- orig/drivers/block/Kconfig Mon Apr 4 22:53:23 2005 +++ linux/drivers/block/Kconfig Mon Apr 4 23:42:07 2005 @@ -6,7 +6,7 @@ menu "Block devices" config BLK_DEV_FD tristate "Normal floppy disk support" - depends on (!ARCH_S390 && !M68K && !IA64 && !UML) || Q40 || (SUN3X && BROKEN) + depends on (!ARCH_S390 && !M68K && !IA64 && !UML) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285 ---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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/