diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /include/asm-arm/arch-ixp4xx/irqs.h | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
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 |