From c2d625c685dbbb2d4b58e34e72c9ac37fb9e9373 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 28 Jul 2011 18:24:25 -0300 Subject: [PATCH] --- yaml --- r: 273663 b: refs/heads/master c: 284f28eec2a44e3ce81abbb451bca72a5d5833f3 h: refs/heads/master i: 273661: 2b7099e34c693a5a528fe429cc5f6603f93c63ac 273659: fae1e96cafb1b281fbc9380331a77d025fb9c44a 273655: 42e467680bde4b12cc29b84671d30764ab2807dd 273647: 6e4561b0d53246745955c29c91f23937305273d8 273631: d1b82fd503be141e9e2364ab269b3c8f30a8e5a1 273599: 8d34f39d2a600498d770bcf42eaff74bf8ae6941 273535: 4a84f9cd1a40de3784983399b2c89829a52e01b4 273407: 708efcfeef07524d631241aac46457d93b620b11 v: v3 --- [refs] | 2 +- trunk/arch/sh/boards/mach-ap325rxa/setup.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 7cdbb80c741f..5eed2432059f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db669e79ed27b7842d1d3495836238fb46e29769 +refs/heads/master: 284f28eec2a44e3ce81abbb451bca72a5d5833f3 diff --git a/trunk/arch/sh/boards/mach-ap325rxa/setup.c b/trunk/arch/sh/boards/mach-ap325rxa/setup.c index 93a9f5dc5918..7030f4c8cf11 100644 --- a/trunk/arch/sh/boards/mach-ap325rxa/setup.c +++ b/trunk/arch/sh/boards/mach-ap325rxa/setup.c @@ -345,9 +345,6 @@ static struct soc_camera_platform_info camera_info = { .width = 640, .height = 480, }, - .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | - SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 | - SOCAM_DATA_ACTIVE_HIGH, .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER | V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_HIGH, @@ -505,8 +502,7 @@ static struct i2c_board_info ap325rxa_i2c_camera[] = { }; static struct ov772x_camera_info ov7725_info = { - .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP | \ - OV772X_FLAG_8BIT, + .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP, .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0), };