diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /include/asm-m32r/ide.h | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-m32r/ide.h')
| -rw-r--r-- | include/asm-m32r/ide.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h index be64f24e37ee..194393bd8beb 100644 --- a/include/asm-m32r/ide.h +++ b/include/asm-m32r/ide.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | static __inline__ int ide_default_irq(unsigned long base) | 35 | static __inline__ int ide_default_irq(unsigned long base) |
| 36 | { | 36 | { |
| 37 | switch (base) { | 37 | switch (base) { |
| 38 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) | 38 | #if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_MAPPI2) || defined(CONFIG_PLAT_MAPPI3) |
| 39 | case 0x1f0: return PLD_IRQ_CFIREQ; | 39 | case 0x1f0: return PLD_IRQ_CFIREQ; |
| 40 | default: | 40 | default: |
| 41 | return 0; | 41 | return 0; |