From 92bd6e5c1201cd25f59c3f66c4f890cd5f8a832e Mon Sep 17 00:00:00 2001 From: Archit Taneja Date: Thu, 19 Apr 2012 17:39:16 +0530 Subject: [PATCH] --- yaml --- r: 300127 b: refs/heads/master c: 08ca7444f589bedf9ad5d82883e5d0754852d73b h: refs/heads/master i: 300125: 876f1dd91820a51e1cce89158f65f757abb685d6 300123: cf882971b1f2e6a7a5a80d53fcc01e4d89ababbf 300119: ecf043682a26737e92e73a7ed23c69cfd8d68b00 300111: 6125d74577e429f6a9eeb4677c8353ddf2b5dd80 300095: bbcaf1f75ca7e89efea2800780f793ffd3e189fd v: v3 --- [refs] | 2 +- .../mach-omap2/include/mach/ctrl_module_pad_core_44xx.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 39137bf042a9..4ec6568666fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6392bd5b11d694a5d563d2ad1d88137d2cde036 +refs/heads/master: 08ca7444f589bedf9ad5d82883e5d0754852d73b diff --git a/trunk/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/trunk/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h index 1e2d3322f33e..c88420de1151 100644 --- a/trunk/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +++ b/trunk/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h @@ -941,10 +941,10 @@ #define OMAP4_DSI2_LANEENABLE_MASK (0x7 << 29) #define OMAP4_DSI1_LANEENABLE_SHIFT 24 #define OMAP4_DSI1_LANEENABLE_MASK (0x1f << 24) -#define OMAP4_DSI2_PIPD_SHIFT 19 -#define OMAP4_DSI2_PIPD_MASK (0x1f << 19) -#define OMAP4_DSI1_PIPD_SHIFT 14 -#define OMAP4_DSI1_PIPD_MASK (0x1f << 14) +#define OMAP4_DSI1_PIPD_SHIFT 19 +#define OMAP4_DSI1_PIPD_MASK (0x1f << 19) +#define OMAP4_DSI2_PIPD_SHIFT 14 +#define OMAP4_DSI2_PIPD_MASK (0x1f << 14) /* CONTROL_MCBSPLP */ #define OMAP4_ALBCTRLRX_FSX_SHIFT 31