diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/kernel/clkdev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 3a170bd3f3d0..de375b64e410 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c | |||
@@ -316,7 +316,7 @@ static struct soc_camera_platform_info camera_info = { | |||
316 | .format_name = "UYVY", | 316 | .format_name = "UYVY", |
317 | .format_depth = 16, | 317 | .format_depth = 16, |
318 | .format = { | 318 | .format = { |
319 | .code = V4L2_MBUS_FMT_YUYV8_2X8_BE, | 319 | .code = V4L2_MBUS_FMT_UYVY8_2X8, |
320 | .colorspace = V4L2_COLORSPACE_SMPTE170M, | 320 | .colorspace = V4L2_COLORSPACE_SMPTE170M, |
321 | .field = V4L2_FIELD_NONE, | 321 | .field = V4L2_FIELD_NONE, |
322 | .width = 640, | 322 | .width = 640, |
diff --git a/arch/sh/kernel/clkdev.c b/arch/sh/kernel/clkdev.c index defdd6e30908..befc255830a4 100644 --- a/arch/sh/kernel/clkdev.c +++ b/arch/sh/kernel/clkdev.c | |||
@@ -36,7 +36,7 @@ static DEFINE_MUTEX(clocks_mutex); | |||
36 | * If an entry has a device ID, it must match | 36 | * If an entry has a device ID, it must match |
37 | * If an entry has a connection ID, it must match | 37 | * If an entry has a connection ID, it must match |
38 | * Then we take the most specific entry - with the following | 38 | * Then we take the most specific entry - with the following |
39 | * order of precidence: dev+con > dev only > con only. | 39 | * order of precedence: dev+con > dev only > con only. |
40 | */ | 40 | */ |
41 | static struct clk *clk_find(const char *dev_id, const char *con_id) | 41 | static struct clk *clk_find(const char *dev_id, const char *con_id) |
42 | { | 42 | { |