Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea04018e authored by Kukjin Kim's avatar Kukjin Kim Committed by Greg Kroah-Hartman
Browse files

arm: fix up some samsung merge sysdev conversion problems 



Following should be fixed in your driver-core/driver-core-next.

From: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent eea915bb

arch/arm/mach-s3c2410/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ arch_initcall(s3c2410_pm_drvinit); 


static struct subsys_interface s3c2410a_pm_interface = {

	.name		= "s3c2410a_pm",

	subsys		= &s3c2410a_subsys,

	.subsys		= &s3c2410a_subsys,

	.add_dev	= s3c2410_pm_add,

};

arch/arm/mach-s3c2412/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static struct subsys_interface s3c2412_pm_interface = { 


static __init int s3c2412_pm_init(void)

{

	return subsys_interface_register_register(&s3c2412_pm_interface);

	return subsys_interface_register(&s3c2412_pm_interface);

}



arch_initcall(s3c2412_pm_init);

arch/arm/mach-s3c2440/s3c2442.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int s3c2442_clk_add(struct device *dev) 
static struct subsys_interface s3c2442_clk_interface = {

	.name		= "s3c2442_clk",

	.subsys		= &s3c2442_subsys,

	.add_dev	 s3c2442_clk_add,

	.add_dev	= s3c2442_clk_add,

};



static __init int s3c2442_clk_init(void)

arch/arm/mach-s5p64x0/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

arch/arm/mach-s5pc100/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -166,5 +166,5 @@ int __init s5pc100_init(void) 
	/* set idle function */

	pm_idle = s5pc100_idle;



	return device_register(&s5pc100_sys);

	return device_register(&s5pc100_dev);

}