diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:16 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 09:20:16 -0400 |
| commit | 7b70c4275f28702b76b273c8534c38f8313812e9 (patch) | |
| tree | 1df2229ca02466bd1adda814ac5c37aa0a597db1 /arch/arm/mach-kirkwood/include/mach/irqs.h | |
| parent | ceb0885d3b01bb2e2f18765770e212914f2864be (diff) | |
| parent | a20df564d15bd28e3df24e1c65b885bd74d23f17 (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/kernel/entry-armv.S
arch/arm/kernel/setup.c
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/irqs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h index f00a0a45a67..9da2eb59180 100644 --- a/arch/arm/mach-kirkwood/include/mach/irqs.h +++ b/arch/arm/mach-kirkwood/include/mach/irqs.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #define IRQ_KIRKWOOD_XOR_10 7 | 23 | #define IRQ_KIRKWOOD_XOR_10 7 |
| 24 | #define IRQ_KIRKWOOD_XOR_11 8 | 24 | #define IRQ_KIRKWOOD_XOR_11 8 |
| 25 | #define IRQ_KIRKWOOD_PCIE 9 | 25 | #define IRQ_KIRKWOOD_PCIE 9 |
| 26 | #define IRQ_KIRKWOOD_PCIE1 10 | ||
| 26 | #define IRQ_KIRKWOOD_GE00_SUM 11 | 27 | #define IRQ_KIRKWOOD_GE00_SUM 11 |
| 27 | #define IRQ_KIRKWOOD_GE01_SUM 15 | 28 | #define IRQ_KIRKWOOD_GE01_SUM 15 |
| 28 | #define IRQ_KIRKWOOD_USB 19 | 29 | #define IRQ_KIRKWOOD_USB 19 |