diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkiewicz@elka.pw.edu.pl> | 2003-05-23 04:27:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-05-23 04:27:11 -0700 |
| commit | 33322ec65ea41eb276051f09c4ac54c2e0d36dd2 (patch) | |
| tree | 378553db9e626c96caca2947b2c125712d0c24cc | |
| parent | e9b2bbae4c642fab18fb4d1ce1202943c560abd2 (diff) | |
[PATCH] _IDE_C cleanup
Since ide_get_best_pio_mode() and ide_pio_timings[]
are now properly exported in ide-lib.c, we can remove
dirty include hacks from some legacy drivers.
| -rw-r--r-- | drivers/ide/legacy/ali14xx.c | 8 | ||||
| -rw-r--r-- | drivers/ide/legacy/dtc2278.c | 8 | ||||
| -rw-r--r-- | drivers/ide/legacy/ht6560b.c | 8 | ||||
| -rw-r--r-- | drivers/ide/legacy/qd65xx.c | 9 | ||||
| -rw-r--r-- | drivers/ide/legacy/umc8672.c | 8 |
5 files changed, 5 insertions, 36 deletions
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c index 5d3e85a59e33..acbe02fc156a 100644 --- a/drivers/ide/legacy/ali14xx.c +++ b/drivers/ide/legacy/ali14xx.c @@ -54,13 +54,7 @@ #include <asm/io.h> -#ifdef CONFIG_BLK_DEV_ALI14XX_MODULE -# define _IDE_C -# include "ide_modes.h" -# undef _IDE_C -#else -# include "ide_modes.h" -#endif /* CONFIG_BLK_DEV_ALI14XX_MODULE */ +#include "ide_modes.h" /* port addresses for auto-detection */ #define ALI_NUM_PORTS 4 diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c index fad634599dd0..c89e28e88940 100644 --- a/drivers/ide/legacy/dtc2278.c +++ b/drivers/ide/legacy/dtc2278.c @@ -21,13 +21,7 @@ #include <asm/io.h> -#ifdef CONFIG_BLK_DEV_DTC2278_MODULE -# define _IDE_C -# include "ide_modes.h" -# undef _IDE_C -#else -# include "ide_modes.h" -#endif /* CONFIG_BLK_DEV_DTC2278_MODULE */ +#include "ide_modes.h" /* * Changing this #undef to #define may solve start up problems in some systems. diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c index 104a99d1af0f..dc5cfc7a8c4e 100644 --- a/drivers/ide/legacy/ht6560b.c +++ b/drivers/ide/legacy/ht6560b.c @@ -53,13 +53,7 @@ #include <asm/io.h> -#ifdef CONFIG_BLK_DEV_HT6560B_MODULE -# define _IDE_C -# include "ide_modes.h" -# undef _IDE_C -#else -# include "ide_modes.h" -#endif /* CONFIG_BLK_DEV_HT6560B_MODULE */ +#include "ide_modes.h" /* #define DEBUG */ /* remove comments for DEBUG messages */ diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c index d1c1db4cb283..3ff868a5896d 100644 --- a/drivers/ide/legacy/qd65xx.c +++ b/drivers/ide/legacy/qd65xx.c @@ -42,14 +42,7 @@ #include <asm/system.h> #include <asm/io.h> -#ifdef CONFIG_BLK_DEV_QD65XX_MODULE -# define _IDE_C -# include "ide_modes.h" -# undef _IDE_C -#else -# include "ide_modes.h" -#endif /* CONFIG_BLK_DEV_QD65XX_MODULE */ - +#include "ide_modes.h" #include "qd65xx.h" /* diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c index 8bf4dc26799c..1ff2a8cc8442 100644 --- a/drivers/ide/legacy/umc8672.c +++ b/drivers/ide/legacy/umc8672.c @@ -54,13 +54,7 @@ #include <asm/io.h> -#ifdef CONFIG_BLK_DEV_UMC8672_MODULE -# define _IDE_C -# include "ide_modes.h" -# undef _IDE_C -#else -# include "ide_modes.h" -#endif /* CONFIG_BLK_DEV_UMC8672_MODULE */ +#include "ide_modes.h" /* * Default speeds. These can be changed with "auto-tune" and/or hdparm. |