From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 9 Jan 2012 16:16:29 +0000 (+0000)
Subject: Merge branch 'samsung/driver' into next/drivers
X-Git-Tag: v3.3-rc1~138^2
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=dcf7ec5ee62a78123057a1e286c88ca739717409;p=sfrench%2Fcifs-2.6.git

Merge branch 'samsung/driver' into next/drivers

Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

dcf7ec5ee62a78123057a1e286c88ca739717409
diff --cc arch/arm/mach-exynos/Makefile
index db527ab4759c,64d14f921271..5fc202cdfdb6
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@@ -47,8 -49,8 +49,9 @@@ obj-$(CONFIG_EXYNOS4_DEV_PD)		+= dev-pd
  obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)	+= dev-sysmmu.o
  obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o
  obj-$(CONFIG_EXYNOS4_DEV_DMA)		+= dma.o
 +obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
  
+ obj-$(CONFIG_ARCH_EXYNOS4)		+= setup-i2c0.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o
  obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o
  obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o
diff --cc arch/arm/mach-exynos/mach-origen.c
index b805e595cc35,586eb995aa96..2b11e046d391
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -41,9 -41,10 +41,11 @@@
  #include <plat/fb.h>
  #include <plat/mfc.h>
  
 +#include <mach/ohci.h>
  #include <mach/map.h>
  
+ #include "common.h"
+ 
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define ORIGEN_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
  				 S3C2410_UCON_RXILEVEL |	\
diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 25a5a405c4bf,a27b23eee9fa..b2c5557f50e4
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -42,8 -42,9 +42,10 @@@
  #include <plat/clock.h>
  
  #include <mach/map.h>
 +#include <mach/ohci.h>
  
+ #include "common.h"
+ 
  /* Following are default values for UCON, ULCON and UFCON UART registers */
  #define SMDKV310_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
  				 S3C2410_UCON_RXILEVEL |	\
diff --cc arch/arm/mach-mxs/include/mach/common.h
index 3bbb94f4bbe1,1388485414c9..e1237ab25862
--- a/arch/arm/mach-mxs/include/mach/common.h
+++ b/arch/arm/mach-mxs/include/mach/common.h
@@@ -16,7 -16,7 +16,8 @@@ struct clk
  extern const u32 *mxs_get_ocotp(void);
  extern int mxs_reset_block(void __iomem *);
  extern void mxs_timer_init(struct clk *, int);
+ extern void mxs_restart(char, const char *);
 +extern int mxs_saif_clkmux_select(unsigned int clkmux);
  
  extern int mx23_register_gpios(void);
  extern int mx23_clocks_init(void);