From f8e5e8926ea7549a629f5b85cc07744255107f17 Mon Sep 17 00:00:00 2001 From: Javier Martin Date: Thu, 12 Jul 2012 11:03:29 +0200 Subject: [PATCH] --- yaml --- r: 326455 b: refs/heads/master c: 462ddb4cf345548dd77a064c2756e9748a9435f5 h: refs/heads/master i: 326453: 2778a82f902fac0a78672ac44e3ac13793c443a0 326451: 1ad1a46af500800290ce72c34b17684124f6cef6 326447: 779f0bf92c80e6fcb2a889a0c1aafde00ec396e1 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-mxc/include/mach/mx2_cam.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ec92f4bef18e..423077373830 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2be5ebfb31630ff0029cd564218f8b3711625e5e +refs/heads/master: 462ddb4cf345548dd77a064c2756e9748a9435f5 diff --git a/trunk/arch/arm/plat-mxc/include/mach/mx2_cam.h b/trunk/arch/arm/plat-mxc/include/mach/mx2_cam.h index 3c080a32dbf5..7ded6f1f74bc 100644 --- a/trunk/arch/arm/plat-mxc/include/mach/mx2_cam.h +++ b/trunk/arch/arm/plat-mxc/include/mach/mx2_cam.h @@ -23,7 +23,6 @@ #ifndef __MACH_MX2_CAM_H_ #define __MACH_MX2_CAM_H_ -#define MX2_CAMERA_SWAP16 (1 << 0) #define MX2_CAMERA_EXT_VSYNC (1 << 1) #define MX2_CAMERA_CCIR (1 << 2) #define MX2_CAMERA_CCIR_INTERLACE (1 << 3) @@ -31,7 +30,6 @@ #define MX2_CAMERA_GATED_CLOCK (1 << 5) #define MX2_CAMERA_INV_DATA (1 << 6) #define MX2_CAMERA_PCLK_SAMPLE_RISING (1 << 7) -#define MX2_CAMERA_PACK_DIR_MSB (1 << 8) /** * struct mx2_camera_platform_data - optional platform data for mx2_camera