summaryrefslogtreecommitdiff
path: root/arch/arm/mach-kirkwood/include/mach/irqs.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2010-08-04 17:14:38 +0400
committerJiri Kosina <jkosina@suse.cz>2010-08-04 17:14:38 +0400
commitd790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch)
tree854ab394486288d40fa8179cbfaf66e8bdc44b0f /arch/arm/mach-kirkwood/include/mach/irqs.h
parent73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff)
parent3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff)
downloadlinux-d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f.tar.xz
Merge branch 'master' into for-next
Diffstat (limited to 'arch/arm/mach-kirkwood/include/mach/irqs.h')
-rw-r--r--arch/arm/mach-kirkwood/include/mach/irqs.h1
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 f00a0a45a67e..9da2eb59180b 100644
--- a/arch/arm/mach-kirkwood/include/mach/irqs.h
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h
@@ -23,6 +23,7 @@
#define IRQ_KIRKWOOD_XOR_10 7
#define IRQ_KIRKWOOD_XOR_11 8
#define IRQ_KIRKWOOD_PCIE 9
+#define IRQ_KIRKWOOD_PCIE1 10
#define IRQ_KIRKWOOD_GE00_SUM 11
#define IRQ_KIRKWOOD_GE01_SUM 15
#define IRQ_KIRKWOOD_USB 19