From ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 6 Jan 2012 16:08:09 +0900 Subject: arm: fix up some samsung merge sysdev conversion problems Following should be fixed in your driver-core/driver-core-next. From: Kukjin Kim Signed-off-by: Greg Kroah-Hartman --- arch/arm/mach-s5p64x0/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-s5p64x0') diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c index 8b029901d91..74387a1bc76 100644 --- a/arch/arm/mach-s5p64x0/cpu.c +++ b/arch/arm/mach-s5p64x0/cpu.c @@ -195,7 +195,7 @@ struct bus_type s5p64x0_subsys = { .dev_name = "s5p64x0-core", }; -static struct device s5p64x0_subsys = { +static struct device s5p64x0_dev = { .bus = &s5p64x0_subsys, }; -- cgit v1.2.3-70-g09d2