diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-15 05:06:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-15 05:06:42 -0400 |
| commit | 4aa96ccf9ee35cdbd0d423e87a4d551019570218 (patch) | |
| tree | dca6322681df2e8f33f65c07defce24db68f645c /arch/arm/mach-shmobile/board-ap4evb.c | |
| parent | cb5fd904f0f14866ab76ec1f6ca3469896e4e2cf (diff) | |
| parent | 8f2ffa00fb3c05ec0659cd7b056c4e8e106072f1 (diff) | |
Merge branch 'kprobes-thumb' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-shmobile/board-ap4evb.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index f6b687f61c28..803bc6edfca4 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
| @@ -913,7 +913,7 @@ static struct i2c_board_info imx074_info = { | |||
| 913 | I2C_BOARD_INFO("imx074", 0x1a), | 913 | I2C_BOARD_INFO("imx074", 0x1a), |
| 914 | }; | 914 | }; |
| 915 | 915 | ||
| 916 | struct soc_camera_link imx074_link = { | 916 | static struct soc_camera_link imx074_link = { |
| 917 | .bus_id = 0, | 917 | .bus_id = 0, |
| 918 | .board_info = &imx074_info, | 918 | .board_info = &imx074_info, |
| 919 | .i2c_adapter_id = 0, | 919 | .i2c_adapter_id = 0, |