From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Dec 2009 18:29:52 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
X-Git-Tag: v2.6.33-rc1~63
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9b2831704e9250269032e3b8c2ffdfca09fd2851;p=~emulex%2Finfiniband.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (33 commits)
  sh: Fix test of unsigned in se7722_irq_demux()
  sh: mach-ecovec24: Add FSI sound support
  sh: mach-ecovec24: Add mt9t112 camera support
  sh: mach-ecovec24: Add tw9910 support
  sh: MSIOF/mmc_spi platform data for the Ecovec24 board
  sh: ms7724se: Add ak4642 support
  sh: Fix up FPU build for SH5
  sh: Remove old early serial console code V2
  sh: sh5 scif pdata (sh5-101/sh5-103)
  sh: sh4a scif pdata (sh7757/sh7763/sh7770/sh7780/sh7785/sh7786/x3)
  sh: sh4a scif pdata (sh7343/sh7366/sh7722/sh7723/sh7724)
  sh: sh4 scif pdata (sh7750/sh7760/sh4-202)
  sh: sh3 scif pdata (sh7705/sh770x/sh7710/sh7720)
  sh: sh2a scif pdata (sh7201/sh7203/sh7206/mxg)
  sh: sh2 scif pdata (sh7616)
  sh-sci: Extend sh-sci driver with early console V2
  sh: Stub in P3 ioremap support for nommu parts.
  sh: wire up vmallocinfo support in ioremap() implementations.
  sh: Make the unaligned trap handler always obey notification levels.
  sh: Couple kernel and user write page perm bits for CONFIG_X2TLB
  ...
---

9b2831704e9250269032e3b8c2ffdfca09fd2851
diff --cc arch/sh/boards/mach-ap325rxa/setup.c
index 7a9f69663f1,4b4320b0b48..1f5fa5c44f6
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@@ -323,16 -322,15 +323,17 @@@ static struct soc_camera_platform_info 
  		.height = 480,
  	},
  	.bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
- 	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+ 	SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 |
+ 	SOCAM_DATA_ACTIVE_HIGH,
  	.set_capture = camera_set_capture,
 -	.link = {
 -		.bus_id		= 0,
 -		.add_device	= ap325rxa_camera_add,
 -		.del_device	= ap325rxa_camera_del,
 -		.module_name	= "soc_camera_platform",
 -	},
 +};
 +
 +struct soc_camera_link camera_link = {
 +	.bus_id		= 0,
 +	.add_device	= ap325rxa_camera_add,
 +	.del_device	= ap325rxa_camera_del,
 +	.module_name	= "soc_camera_platform",
 +	.priv		= &camera_info,
  };
  
  static void dummy_release(struct device *dev)