diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 20:19:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-08 20:19:11 +0200 |
| commit | 90621ed829ac64eb25b4d1214e9a5155e5c67ff2 (patch) | |
| tree | 472b2cb259bed27fc9ce7a3e6ca413b84830e58f /include | |
| parent | Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff) | |
| parent | it8213: fix return value in it8213_init_one() (diff) | |
| download | linux-90621ed829ac64eb25b4d1214e9a5155e5c67ff2.tar.xz linux-90621ed829ac64eb25b4d1214e9a5155e5c67ff2.zip | |
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, hw->io_ports.ctl_addr = ctl_addr; } +/* for IDE PCI controllers in legacy mode, temporary */ +static inline int __ide_default_irq(unsigned long base) +{ + switch (base) { +#ifdef CONFIG_IA64 + case 0x1f0: return isa_irq_to_vector(14); + case 0x170: return isa_irq_to_vector(15); +#else + case 0x1f0: return 14; + case 0x170: return 15; +#endif + } + return 0; +} + #include <asm/ide.h> #if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED) |