From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 30 Oct 2011 19:59:09 +0000 (+0100)
Subject: Merge branch 'pxa/devel' into next/devel2
X-Git-Tag: v3.2-rc1~39^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b8bc83971cc20cae3c3b65c26a804f350d74960c;p=~emulex%2Finfiniband.git

Merge branch 'pxa/devel' into next/devel2

Conflicts:
	arch/arm/mach-s3c2416/s3c2416.c
---

b8bc83971cc20cae3c3b65c26a804f350d74960c
diff --cc arch/arm/mach-s3c2416/s3c2416.c
index 081ef4cb868,20b3fdfb305..ee214bc83c8
--- a/arch/arm/mach-s3c2416/s3c2416.c
+++ b/arch/arm/mach-s3c2416/s3c2416.c
@@@ -98,9 -97,9 +98,11 @@@ int __init s3c2416_init(void
  
  	s3c_fb_setname("s3c2443-fb");
  
 +	s3c_adc_setname("s3c2416-adc");
 +
+ #ifdef CONFIG_PM
  	register_syscore_ops(&s3c2416_pm_syscore_ops);
+ #endif
  	register_syscore_ops(&s3c24xx_irq_syscore_ops);
  
  	return sysdev_register(&s3c2416_sysdev);