diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 14:19:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 14:19:11 -0400 |
| commit | 90621ed829ac64eb25b4d1214e9a5155e5c67ff2 (patch) | |
| tree | 472b2cb259bed27fc9ce7a3e6ca413b84830e58f /include | |
| parent | 9c0fc4e28b57c5a6da7b58d60f71476c64d457a6 (diff) | |
| parent | be305042b7a01a1ab03a8adfa95f57bc63e012e1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
it8213: fix return value in it8213_init_one()
palm_bk3710: fix IDECLK period calculation
ide: add __ide_default_irq() inline helper
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 9918772bf274..eddb6daadf4a 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
| @@ -189,6 +189,21 @@ static inline void ide_std_init_ports(hw_regs_t *hw, | |||
| 189 | hw->io_ports.ctl_addr = ctl_addr; | 189 | hw->io_ports.ctl_addr = ctl_addr; |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | /* for IDE PCI controllers in legacy mode, temporary */ | ||
| 193 | static inline int __ide_default_irq(unsigned long base) | ||
| 194 | { | ||
| 195 | switch (base) { | ||
| 196 | #ifdef CONFIG_IA64 | ||
| 197 | case 0x1f0: return isa_irq_to_vector(14); | ||
| 198 | case 0x170: return isa_irq_to_vector(15); | ||
| 199 | #else | ||
| 200 | case 0x1f0: return 14; | ||
| 201 | case 0x170: return 15; | ||
| 202 | #endif | ||
| 203 | } | ||
| 204 | return 0; | ||
| 205 | } | ||
| 206 | |||
| 192 | #include <asm/ide.h> | 207 | #include <asm/ide.h> |
| 193 | 208 | ||
| 194 | #if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED) | 209 | #if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED) |