From 81a3ebe9f89e04ec916a6ba3a3a6b387524d386d Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Mon, 28 Sep 2009 16:29:48 +0100 Subject: [PATCH] --- yaml --- r: 172539 b: refs/heads/master c: 7bcb7eda99f1091055d547aee1a1d8e65b59c592 h: refs/heads/master i: 172537: dc26260e09ec56be39962eb5275b39356ed7a9f9 172535: aca92534c44ea9b088b56badeecf7d70c95107b1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c2410/mach-n30.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98ccc846c051..403b6844cb2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 372359eca4569f9321c820d6e5259e19eb4e63ad +refs/heads/master: 7bcb7eda99f1091055d547aee1a1d8e65b59c592 diff --git a/trunk/arch/arm/mach-s3c2410/mach-n30.c b/trunk/arch/arm/mach-s3c2410/mach-n30.c index 0f6ed61af415..0405712c2263 100644 --- a/trunk/arch/arm/mach-s3c2410/mach-n30.c +++ b/trunk/arch/arm/mach-s3c2410/mach-n30.c @@ -338,7 +338,7 @@ static struct platform_device *n35_devices[] __initdata = { &n35_button_device, }; -static struct s3c2410_platform_i2c n30_i2ccfg = { +static struct s3c2410_platform_i2c __initdata n30_i2ccfg = { .flags = 0, .slave_addr = 0x10, .frequency = 10*1000, @@ -500,8 +500,8 @@ static void __init n30_init_irq(void) static void __init n30_init(void) { s3c24xx_fb_set_platdata(&n30_fb_info); - s3c_device_i2c0.dev.platform_data = &n30_i2ccfg; s3c24xx_udc_set_platdata(&n30_udc_cfg); + s3c_i2c0_set_platdata(&n30_i2ccfg); /* Turn off suspend on both USB ports, and switch the * selectable USB port to USB device mode. */