lkml.org 
[lkml]   [2012]   [Jan]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the driver-core tree with the arm tree
Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/mach-s5pc100/common.c between commit 109ac862f737 ("ARM:
mach-s5pc100: use standard arch_idle()") from the arm tree and commit
4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from
the driver-core 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 4659fb9,af52c09..0000000
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@@ -194,27 -154,17 +195,27 @@@ static struct device s5pc100_dev =

static int __init s5pc100_core_init(void)
{
- return sysdev_class_register(&s5pc100_sysclass);
+ return subsys_system_register(&s5pc100_subsys, NULL);
}
-
core_initcall(s5pc100_core_init);

int __init s5pc100_init(void)
{
printk(KERN_INFO "S5PC100: Initializing architecture\n");
- return sysdev_register(&s5pc100_sysdev);
++ return device_register(&s5pc100_sys);
+}

- /* set idle function */
- pm_idle = s5pc100_idle;
+/* uart registration process */

- return device_register(&s5pc100_sys);
+void __init s5pc100_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+{
+ s3c24xx_init_uartdevs("s3c6400-uart", s5p_uart_resources, cfg, no);
+}
+
+void s5pc100_restart(char mode, const char *cmd)
+{
+ if (mode != 's')
+ arch_wdt_reset();
+
+ soft_restart(0);
}
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-01-06 07:55    [W:0.062 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site