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>

diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index 25a2fdaf8a826b0f1f273f59582b1d61484496ce..2d83b18e1aa48a1dc3d84d16662f26bf42b5979b 100755 (executable)
--- 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()
 {
 }
@@ -517,6 +510,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,
@@ -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 {