diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-10 17:48:04 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-06-24 15:40:44 +0200 |
| commit | 8f785e8549fbf73995a7795651709b458300ed01 (patch) | |
| tree | 314eef1c8acc303dc01b3388e5ea5050866df94b | |
| parent | 68a9c5ba14856d3738c906764aa38336f02e2e11 (diff) | |
ARM: imx1: rename imx_i2c_device to follow a common naming scheme
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mx1/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx1/devices.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mx1/mach-mx1ads.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx1/devices.c b/arch/arm/mach-mx1/devices.c index fa3809d2d1bf..c770aa0a10de 100644 --- 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 899f8d97e682..851d6dfccf2e 100644 --- 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 27c8222092af..16adc6194706 100644 --- 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) |