diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-19 12:17:34 -0400 |
| commit | cf816ecb533ab96b883dfdc0db174598b5b5c4d2 (patch) | |
| tree | 1b7705db288ae2917105e624b01fdf81e0882bf1 /include/asm-sparc64/ide.h | |
| parent | adf6d34e460387ee3e8f1e1875d52bff51212c7d (diff) | |
| parent | 15f7d677ccff6f0f5de8a1ee43a792567e9f9de9 (diff) | |
Merge branch 'merge-fixes' into devel
Diffstat (limited to 'include/asm-sparc64/ide.h')
| -rw-r--r-- | include/asm-sparc64/ide.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h index ac7eb210b941..c5fdabe0b42d 100644 --- a/include/asm-sparc64/ide.h +++ b/include/asm-sparc64/ide.h | |||
| @@ -24,8 +24,6 @@ | |||
| 24 | # endif | 24 | # endif |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ | ||
| 28 | |||
| 29 | #define __ide_insl(data_reg, buffer, wcount) \ | 27 | #define __ide_insl(data_reg, buffer, wcount) \ |
| 30 | __ide_insw(data_reg, buffer, (wcount)<<1) | 28 | __ide_insw(data_reg, buffer, (wcount)<<1) |
| 31 | #define __ide_outsl(data_reg, buffer, wcount) \ | 29 | #define __ide_outsl(data_reg, buffer, wcount) \ |