Messages in this thread | | | Date | Mon, 9 Jan 2012 10:53:20 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the arm tree with Linus tree |
| |
Hi Russell,
Today's linux-next merge of the arm tree got a conflict in arch/arm/mach-s5pc100/common.c between commit 7affca3537d7 ("Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core") from Linus' tree and commit 109ac862f737 ("ARM: mach-s5pc100: use standard arch_idle()") from the arm tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-s5pc100/common.c index c909573,4659fb9..0000000 --- a/arch/arm/mach-s5pc100/common.c +++ b/arch/arm/mach-s5pc100/common.c @@@ -210,11 -201,7 +202,7 @@@ core_initcall(s5pc100_core_init) int __init s5pc100_init(void) { printk(KERN_INFO "S5PC100: Initializing architecture\n"); - /* set idle function */ - pm_idle = s5pc100_idle; - return sysdev_register(&s5pc100_sysdev); + return device_register(&s5pc100_dev); } /* uart registration process */ [unhandled content-type:application/pgp-signature] | |