summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/include
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 20:59:44 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-26 20:59:44 +0100
commitdcf81c1af839b77b44404453ecae6e5ac5a75f05 (patch)
tree289dcbda5fbca34e7e0cf028908b9b517fa8b8b2 /arch/arm/mach-vexpress/include
parentMerge branches 'debug' and 'idle' into for-armsoc (diff)
parentARM: amba: samsung: use common amba device initializers (diff)
downloadlinux-dcf81c1af839b77b44404453ecae6e5ac5a75f05.tar.xz
linux-dcf81c1af839b77b44404453ecae6e5ac5a75f05.zip
Merge branch 'amba' into for-armsoc
Diffstat (limited to 'arch/arm/mach-vexpress/include')
-rw-r--r--arch/arm/mach-vexpress/include/mach/ct-ca9x4.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h b/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
index a34d3d4faae1..a40468f3b938 100644
--- a/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
+++ b/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
@@ -35,7 +35,7 @@
* Interrupts. Those in {} are for AMBA devices
*/
#define IRQ_CT_CA9X4_CLCDC { 76 }
-#define IRQ_CT_CA9X4_DMC { -1 }
+#define IRQ_CT_CA9X4_DMC { 0 }
#define IRQ_CT_CA9X4_SMC { 77, 78 }
#define IRQ_CT_CA9X4_TIMER0 80
#define IRQ_CT_CA9X4_TIMER1 81