diff options
| author | Anton Arapov <anton@redhat.com> | 2012-05-15 10:24:02 +0200 |
|---|---|---|
| committer | Anton Arapov <anton@redhat.com> | 2012-05-15 10:24:02 +0200 |
| commit | fe2895d3d55146cac65b273c0f83e2c7e543cd0e (patch) | |
| tree | 79e126e92ac8357191613fd166826bcb2cac0047 /arch/arm/mach-omap2 | |
| parent | c0e33d8195b424eb29432998c565d09398933d32 (diff) | |
| download | kernel-uprobes-fe2895d3d55146cac65b273c0f83e2c7e543cd0e.tar.gz kernel-uprobes-fe2895d3d55146cac65b273c0f83e2c7e543cd0e.tar.xz kernel-uprobes-fe2895d3d55146cac65b273c0f83e2c7e543cd0e.zip | |
fedora kernel: be402e5a53d5ac42b5a17e0a207dae63a67f2786v3.3.6-1
Signed-off-by: Anton Arapov <anton@redhat.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h index 1e2d3322f33..c88420de115 100644 --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +++ b/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 |