linux-next: manual merge of the usb tree with the s5p tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-exynos/mach-universal_c210.c between commit 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 3a36dd068f43 ("ARM: EXYNOS: Add s3c-hsotg
device support for Universal C210 board") from the usb tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
index dd8ec8d4,9be8a07..0000000
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@@ -23,7 -23,7 +23,8 @@@
  #include <linux/i2c-gpio.h>
  #include <linux/i2c/mcs.h>
  #include <linux/i2c/atmel_mxt_ts.h>
 +#include <drm/exynos_drm.h>
+ #include <linux/platform_data/s3c-hsotg.h>
  
  #include <asm/mach/arch.h>
  #include <asm/hardware/gic.h>
@@@ -1076,9 -1058,7 +1085,10 @@@ static struct platform_device *universa
  	&s5p_device_onenand,
  	&s5p_device_fimd0,
  	&s5p_device_jpeg,
 +#ifdef CONFIG_DRM_EXYNOS
 +	&exynos_device_drm,
 +#endif
+ 	&s3c_device_usb_hsotg,
  	&s5p_device_mfc,
  	&s5p_device_mfc_l,
  	&s5p_device_mfc_r,

Attachment: pgp00000.pgp
Description: PGP signature