ARM: imx1: rename imx_i2c_device to follow a common naming scheme

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c
index fa3809d2d1bf3795be138fdce4f643f872e41fe7..c770aa0a10de200cea9a4e04976c7390e30bcb57 100644 (file)
--- a/arch/arm/mach-mx1/devices.c
+++ b/arch/arm/mach-mx1/devices.c
@@ -66,7 +66,7 @@ static struct resource imx_i2c_resources[] = {
        },
 };
 
-struct platform_device imx_i2c_device = {
+struct platform_device imx_i2c_device0 = {
        .name           = "imx-i2c",
        .id             = 0,
        .resource       = imx_i2c_resources,

diff --git a/arch/arm/mach-mx1/devices.h b/arch/arm/mach-mx1/devices.h
index 899f8d97e6827f0bc5e59babd34e07fe7de1a87c..851d6dfccf2e6ff99842304c0a00859cc41b2dab 100644 (file)
--- a/arch/arm/mach-mx1/devices.h
+++ b/arch/arm/mach-mx1/devices.h
@@ -1,5 +1,5 @@
 extern struct platform_device imx1_camera_device;
-extern struct platform_device imx_i2c_device;
+extern struct platform_device imx_i2c_device0;
 extern struct platform_device imx_uart1_device;
 extern struct platform_device imx_uart2_device;
 extern struct platform_device imx_rtc_device;

diff --git a/arch/arm/mach-mx1/mach-mx1ads.c b/arch/arm/mach-mx1/mach-mx1ads.c
index 27c8222092af4cb0f0ac14e4c237389412b4d4b6..16adc61947060f5ba1913b109e251c5ab49f02cd 100644 (file)
--- a/arch/arm/mach-mx1/mach-mx1ads.c
+++ b/arch/arm/mach-mx1/mach-mx1ads.c
@@ -131,7 +131,7 @@ static void __init mx1ads_init(void)
        i2c_register_board_info(0, mx1ads_i2c_devices,
                                ARRAY_SIZE(mx1ads_i2c_devices));
 
-       mxc_register_device(&imx_i2c_device, &mx1ads_i2c_data);
+       mxc_register_device(&imx_i2c_device0, &mx1ads_i2c_data);
 }
 
 static void __init mx1ads_timer_init(void)