diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /include/linux/ftape.h | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
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 c6b38d5b9186..72faeec9f6e1 100644 --- a/include/linux/ftape.h +++ b/include/linux/ftape.h | |||
| @@ -165,7 +165,7 @@ typedef union { | |||
| 165 | # undef CONFIG_FT_FDC_DMA | 165 | # undef CONFIG_FT_FDC_DMA |
| 166 | # define CONFIG_FT_FDC_DMA 2 | 166 | # define CONFIG_FT_FDC_DMA 2 |
| 167 | # endif | 167 | # endif |
| 168 | #elif CONFIG_FT_ALT_FDC == 1 /* CONFIG_FT_MACH2 */ | 168 | #elif defined(CONFIG_FT_ALT_FDC) /* CONFIG_FT_MACH2 */ |
| 169 | # if CONFIG_FT_FDC_BASE == 0 | 169 | # if CONFIG_FT_FDC_BASE == 0 |
| 170 | # undef CONFIG_FT_FDC_BASE | 170 | # undef CONFIG_FT_FDC_BASE |
| 171 | # define CONFIG_FT_FDC_BASE 0x370 | 171 | # define CONFIG_FT_FDC_BASE 0x370 |