diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-09-08 14:27:13 -0700 |
| commit | 344a076110f4ecb16ea6d286b63be696604982ed (patch) | |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 /drivers/block/Kconfig | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f (diff) | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 (diff) | |
[IA64] Manual merge fix for 3 files
arch/ia64/Kconfig
arch/ia64/kernel/acpi.c
include/asm-ia64/irq.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/block/Kconfig')
| -rw-r--r-- | drivers/block/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 6b736364cc5..51b0af1cebe 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -6,7 +6,7 @@ menu "Block devices" config BLK_DEV_FD tristate "Normal floppy disk support" - depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285 + depends on ARCH_MAY_HAVE_PC_FDC ---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 |