From 5616131daff6047d293b25a05cff7b1890efd6a3 Mon Sep 17 00:00:00 2001 From: Haojian Zhuang Date: Fri, 30 Mar 2012 09:00:50 +0800 Subject: ARM: pxa: fix build issue on stargate2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit arch/arm/mach-pxa/stargate2.c:155:3: error: unknown field ‘dev’ specified in initializer arch/arm/mach-pxa/stargate2.c:155:3: warning: initialization from incompatible pointer type [enabled by default] arch/arm/mach-pxa/stargate2.c:155:3: warning: (near initialization for ‘stargate2_sensor_3_con[0].dev_name’) [enabled by default] make[1]: *** [arch/arm/mach-pxa/stargate2.o] Error 1 make: *** [arch/arm/mach-pxa] Error 2 It's caused by 'dev' field removed from struct regulator_consumer_supply. Signed-off-by: Haojian Zhuang diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index b0656e15..227a630 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c @@ -152,7 +152,7 @@ static struct platform_device sht15 = { static struct regulator_consumer_supply stargate2_sensor_3_con[] = { { - .dev = &sht15.dev, + .dev_name = "sht15", .supply = "vcc", }, }; -- cgit v0.10.2