diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:31:12 -0400 |
| commit | 3e370b29d35fb01bfb92c2814d6f79bf6a2cb970 (patch) | |
| tree | 3b8fb467d60bfe6a34686f4abdc3a60050ba40a4 /include/asm-arm/arch-ixp4xx/irqs.h | |
| parent | 88d1dce3a74367291f65a757fbdcaf17f042f30c (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
Conflicts:
drivers/pci/quirks.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/irqs.h')
| -rw-r--r-- | include/asm-arm/arch-ixp4xx/irqs.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ixp4xx/irqs.h b/include/asm-arm/arch-ixp4xx/irqs.h index 11801605047b..674af4a84147 100644 --- a/include/asm-arm/arch-ixp4xx/irqs.h +++ b/include/asm-arm/arch-ixp4xx/irqs.h | |||
| @@ -128,4 +128,11 @@ | |||
| 128 | #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 | 128 | #define IRQ_DSMG600_PCI_INTE IRQ_IXP4XX_GPIO7 |
| 129 | #define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 | 129 | #define IRQ_DSMG600_PCI_INTF IRQ_IXP4XX_GPIO6 |
| 130 | 130 | ||
| 131 | /* | ||
| 132 | * Freecom FSG-3 Board IRQs | ||
| 133 | */ | ||
| 134 | #define IRQ_FSG_PCI_INTA IRQ_IXP4XX_GPIO6 | ||
| 135 | #define IRQ_FSG_PCI_INTB IRQ_IXP4XX_GPIO7 | ||
| 136 | #define IRQ_FSG_PCI_INTC IRQ_IXP4XX_GPIO5 | ||
| 137 | |||
| 131 | #endif | 138 | #endif |