diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-01-31 12:24:00 -0500 |
| commit | 30716e07ef511ec7525c07eb1e8060ba8943c2a2 (patch) | |
| tree | eb6a47cae63d3587fa773cc5a16781eaa2c7810b /include/asm-generic | |
| parent | 03c79cc56e4497cbd09d74a73c1bd0d1d9a8a16c (diff) | |
| parent | f56df2f4db6e4af87fb8e941cff69f4501a111df (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/libata-portmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/libata-portmap.h b/include/asm-generic/libata-portmap.h index 9202fd02d5be..62fb3618293d 100644 --- a/include/asm-generic/libata-portmap.h +++ b/include/asm-generic/libata-portmap.h | |||
| @@ -3,10 +3,10 @@ | |||
| 3 | 3 | ||
| 4 | #define ATA_PRIMARY_CMD 0x1F0 | 4 | #define ATA_PRIMARY_CMD 0x1F0 |
| 5 | #define ATA_PRIMARY_CTL 0x3F6 | 5 | #define ATA_PRIMARY_CTL 0x3F6 |
| 6 | #define ATA_PRIMARY_IRQ 14 | 6 | #define ATA_PRIMARY_IRQ(dev) 14 |
| 7 | 7 | ||
| 8 | #define ATA_SECONDARY_CMD 0x170 | 8 | #define ATA_SECONDARY_CMD 0x170 |
| 9 | #define ATA_SECONDARY_CTL 0x376 | 9 | #define ATA_SECONDARY_CTL 0x376 |
| 10 | #define ATA_SECONDARY_IRQ 15 | 10 | #define ATA_SECONDARY_IRQ(dev) 15 |
| 11 | 11 | ||
| 12 | #endif | 12 | #endif |