diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 09:30:20 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 09:30:20 +0100 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/linux/ftape.h | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
| download | op-kernel-dev-661299d9d0437a0ff72240f3d60016ac3a361a6e.zip op-kernel-dev-661299d9d0437a0ff72240f3d60016ac3a361a6e.tar.gz | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/linux/ftape.h')
| -rw-r--r-- | include/linux/ftape.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/ftape.h b/include/linux/ftape.h index c6b38d5..72faeec 100644 --- a/include/linux/ftape.h +++ b/include/linux/ftape.h @@ -165,7 +165,7 @@ typedef union { # undef CONFIG_FT_FDC_DMA # define CONFIG_FT_FDC_DMA 2 # endif -#elif CONFIG_FT_ALT_FDC == 1 /* CONFIG_FT_MACH2 */ +#elif defined(CONFIG_FT_ALT_FDC) /* CONFIG_FT_MACH2 */ # if CONFIG_FT_FDC_BASE == 0 # undef CONFIG_FT_FDC_BASE # define CONFIG_FT_FDC_BASE 0x370 |
