linux-next: manual merge of the driver-core tree with the arm tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Greg,

Today's linux-next merge of the driver-core tree got a conflict in
arch/arm/plat-samsung/include/plat/cpu.h between commit b024043b6d0d
("ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]")
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@xxxxxxxxxxxxxxxx

diff --cc arch/arm/plat-samsung/include/plat/cpu.h
index abbdadb,0122a22..0000000
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@@ -181,20 -183,22 +181,20 @@@ extern struct syscore_ops s3c2410_pm_sy
  extern struct syscore_ops s3c2412_pm_syscore_ops;
  extern struct syscore_ops s3c2416_pm_syscore_ops;
  extern struct syscore_ops s3c244x_pm_syscore_ops;
 -extern struct syscore_ops s3c64xx_irq_syscore_ops;
  
- /* system device classes */
- 
- extern struct sysdev_class s3c2410_sysclass;
- extern struct sysdev_class s3c2410a_sysclass;
- extern struct sysdev_class s3c2412_sysclass;
- extern struct sysdev_class s3c2416_sysclass;
- extern struct sysdev_class s3c2440_sysclass;
- extern struct sysdev_class s3c2442_sysclass;
- extern struct sysdev_class s3c2443_sysclass;
- extern struct sysdev_class s3c6410_sysclass;
- extern struct sysdev_class s5p64x0_sysclass;
- extern struct sysdev_class s5pv210_sysclass;
- extern struct sysdev_class exynos4_sysclass;
+ /* system device subsystems */
+ 
+ extern struct bus_type s3c2410_subsys;
+ extern struct bus_type s3c2410a_subsys;
+ extern struct bus_type s3c2412_subsys;
+ extern struct bus_type s3c2416_subsys;
+ extern struct bus_type s3c2440_subsys;
+ extern struct bus_type s3c2442_subsys;
+ extern struct bus_type s3c2443_subsys;
+ extern struct bus_type s3c6410_subsys;
 -extern struct bus_type s3c64xx_subsys;
+ extern struct bus_type s5p64x0_subsys;
+ extern struct bus_type s5pv210_subsys;
+ extern struct bus_type exynos4_subsys;
  
  extern void (*s5pc1xx_idle)(void);

Attachment: pgptsLvtQsQ8B.pgp
Description: PGP signature