diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /include/asm-sh/ide.h | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-sh/ide.h')
| -rw-r--r-- | include/asm-sh/ide.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h index f42cf3977a57..711dad4cb48b 100644 --- a/include/asm-sh/ide.h +++ b/include/asm-sh/ide.h | |||
| @@ -16,10 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/config.h> | 17 | #include <linux/config.h> |
| 18 | 18 | ||
| 19 | #ifndef MAX_HWIFS | ||
| 20 | #define MAX_HWIFS CONFIG_IDE_MAX_HWIFS | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #define ide_default_io_ctl(base) (0) | 19 | #define ide_default_io_ctl(base) (0) |
| 24 | 20 | ||
| 25 | #include <asm-generic/ide_iops.h> | 21 | #include <asm-generic/ide_iops.h> |