From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 16 Mar 2012 19:13:58 +0000 (+0000)
Subject: Merge branch 'ux500/soc' into ux500/dt
X-Git-Tag: v3.4-rc1~71^2~3^2~11
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f56b71f5d5a3944acdcb0e5e1739574d95ddf61a;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'ux500/soc' into ux500/dt
---

f56b71f5d5a3944acdcb0e5e1739574d95ddf61a
diff --cc arch/arm/mach-ux500/include/mach/setup.h
index 93d4039,74b43bb..3dc00ff
--- a/arch/arm/mach-ux500/include/mach/setup.h
+++ b/arch/arm/mach-ux500/include/mach/setup.h
@@@ -23,10 -23,15 +23,12 @@@ extern struct device * __init u8500_ini
  
  extern void __init ux500_init_irq(void);
  
- extern void __init u5500_sdi_init(void);
+ extern void __init u5500_sdi_init(struct device *parent);
  
- extern void __init db5500_dma_init(void);
+ extern void __init db5500_dma_init(struct device *parent);
+ 
+ extern struct device *ux500_soc_device_init(const char *soc_id);
  
 -/* We re-use nomadik_timer for this platform */
 -extern void nmdk_timer_init(void);
 -
  struct amba_device;
  extern void __init amba_add_devices(struct amba_device *devs[], int num);