diff options
| author | Zeng Zhaoming <b32542@freescale.com> | 2011-04-21 03:34:56 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2012-01-09 20:08:23 +0800 |
| commit | 0136dfa217c628ebd1d5dd4f5ccec1f02eb5b673 (patch) | |
| tree | 0dc68cc0e714dbfeca0c35ba2670f7917d650d3f /arch/arm/mach-mx5 | |
| parent | 58817a856d571cf7745bd052fac5d49fbc398a79 (diff) | |
ENGR00142413: MX51: Fix mx51 I2c board info multiple defined in 2.6.38
Multiple defined i2c board info in 2.6.38 kernel for mx51 bbg.
This cause a build error.
Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
Diffstat (limited to 'arch/arm/mach-mx5')
| -rwxr-xr-x | arch/arm/mach-mx5/board-mx51_babbage.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c index 25a2fdaf8a82..2d83b18e1aa4 100755 --- a/arch/arm/mach-mx5/board-mx51_babbage.c +++ b/arch/arm/mach-mx5/board-mx51_babbage.c @@ -239,13 +239,6 @@ static const struct esdhc_platform_data mx51_bbg_sd2_data __initconst = { .cd_gpio = MX51_BBG_SD2_CD, }; -static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { - { - .type = "sgtl5000", - .addr = 0x0a, - }, -}; - static void babbage_suspend_enter() { } @@ -518,6 +511,10 @@ static struct fsl_mxc_ddc_platform_data bbg_ddc_dvi_data = { static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { { + .type = "sgtl5000", + .addr = 0x0a, + }, + { .type = "mxc_ddc", .addr = 0x50, .irq = gpio_to_irq(BABBAGE_DVI_DET), @@ -677,8 +674,6 @@ static void __init mx51_babbage_init(void) i2c_register_board_info(3, mxc_i2c_hs_board_info, ARRAY_SIZE(mxc_i2c_hs_board_info)); - i2c_register_board_info(1, mxc_i2c1_board_info, - ARRAY_SIZE(mxc_i2c1_board_info)); /*if (otg_mode_host) mxc_register_device(&mxc_usbdr_host_device, &dr_utmi_config); else { |