diff options
| author | Zeng Zhaoming <b32542@freescale.com> | 2011-04-21 03:34:56 +0800 |
|---|---|---|
| committer | Richard Zhao <richard.zhao@freescale.com> | 2011-04-21 17:35:52 +0800 |
| commit | ea4336b4a166d23a18c2b2c01883218e12643f74 (patch) | |
| tree | 883c8d8098ac5c5acee1e140735df2cdc0932242 | |
| parent | e0860e6457fced271c547db9f6fd0d6b6f1c9e40 (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>
Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
| -rw-r--r-- | 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 59336809916..45c7d76d85c 100644 --- 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 { |