From 664d2dce21f58c11645b8f7adf265efe5632fb08 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 4 Sep 2012 17:43:29 -0700 Subject: [PATCH] --- yaml --- r: 326506 b: refs/heads/master c: 9ee073176808bba3039dabeaf6553ecdb9d7f765 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/plat/dma.h | 2 ++ trunk/arch/arm/plat-omap/include/plat/irqs.h | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f8c39efcf0c5..ec3d93a89501 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1e01703bacbadd22eb4aaca0bbba59bcba7d3b3 +refs/heads/master: 9ee073176808bba3039dabeaf6553ecdb9d7f765 diff --git a/trunk/arch/arm/plat-omap/include/plat/dma.h b/trunk/arch/arm/plat-omap/include/plat/dma.h index c5811d4409b0..0a87b052f8f7 100644 --- a/trunk/arch/arm/plat-omap/include/plat/dma.h +++ b/trunk/arch/arm/plat-omap/include/plat/dma.h @@ -31,6 +31,8 @@ /* Move omap4 specific defines to dma-44xx.h */ #include "dma-44xx.h" +#define INT_DMA_LCD 25 + /* DMA channels for omap1 */ #define OMAP_DMA_NO_DEVICE 0 #define OMAP_DMA_MCSI1_TX 1 diff --git a/trunk/arch/arm/plat-omap/include/plat/irqs.h b/trunk/arch/arm/plat-omap/include/plat/irqs.h index 37bbbbb981b2..15f497c2602e 100644 --- a/trunk/arch/arm/plat-omap/include/plat/irqs.h +++ b/trunk/arch/arm/plat-omap/include/plat/irqs.h @@ -53,7 +53,6 @@ #define INT_DMA_CH3 22 #define INT_DMA_CH4 23 #define INT_DMA_CH5 24 -#define INT_DMA_LCD 25 #define INT_TIMER1 26 #define INT_WD_TIMER 27 #define INT_BRIDGE_PUB 28