diff options
author | Magnus Damm <damm@igel.co.jp> | 2008-07-29 07:57:38 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-07-29 08:05:04 -0400 |
commit | e565b518ec3a62aebf54da31c65bb6036bb5a276 (patch) | |
tree | 02371e081fb288ae92fac2e367f1fcb5807e1abc /arch/sh/boards/mach-ap325rxa/setup.c | |
parent | da2014a2b080e7f3024a4eb6917d47069ad9620b (diff) |
sh: I2C fix for AP325RXA and Migo-R
Fix recently introduced I2C build breakage on AP325RXA and Migo-R.
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-ap325rxa/setup.c')
-rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index 7fa74462bd9f..9c71603d29a2 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c | |||
@@ -165,6 +165,7 @@ static struct platform_device lcdc_device = { | |||
165 | }, | 165 | }, |
166 | }; | 166 | }; |
167 | 167 | ||
168 | #ifdef CONFIG_I2C | ||
168 | static unsigned char camera_ncm03j_magic[] = | 169 | static unsigned char camera_ncm03j_magic[] = |
169 | { | 170 | { |
170 | 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, | 171 | 0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8, |
@@ -234,6 +235,7 @@ static struct platform_device camera_device = { | |||
234 | .platform_data = &camera_info, | 235 | .platform_data = &camera_info, |
235 | }, | 236 | }, |
236 | }; | 237 | }; |
238 | #endif /* CONFIG_I2C */ | ||
237 | 239 | ||
238 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { | 240 | static struct sh_mobile_ceu_info sh_mobile_ceu_info = { |
239 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | | 241 | .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | |
@@ -270,7 +272,9 @@ static struct platform_device *ap325rxa_devices[] __initdata = { | |||
270 | &ap325rxa_nor_flash_device, | 272 | &ap325rxa_nor_flash_device, |
271 | &lcdc_device, | 273 | &lcdc_device, |
272 | &ceu_device, | 274 | &ceu_device, |
275 | #ifdef CONFIG_I2C | ||
273 | &camera_device, | 276 | &camera_device, |
277 | #endif | ||
274 | }; | 278 | }; |
275 | 279 | ||
276 | static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { | 280 | static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = { |