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

From: Stephen Rothwell
Date: Mon May 14 2012 - 03:48:29 EST

Hi Greg,

Today's linux-next merge of the usb tree got conflicts in
arch/arm/mach-exynos/mach-nuri.c and
arch/arm/mach-exynos/mach-universal_c210.c between commits db6856e8d8ab
("ARM: EXYNOS: Add DRM core support for NURI board") and 6dafa4aead1b
("ARM: EXYNOS: Add DRM core device support for Universal C210 board")
from the s5p tree and commit 126625e1bf32 ("usb:hsotg:samsung:cosmetic
Move <linux/platform_data/s3c-hsotg.h> to proper place") from the usb

Just context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-exynos/mach-nuri.c
index 17cce18,2c6d701..0000000
--- a/arch/arm/mach-exynos/mach-nuri.c
+++ b/arch/arm/mach-exynos/mach-nuri.c
@@@ -25,7 -25,7 +25,8 @@@
#include <linux/mmc/host.h>
#include <linux/fb.h>
#include <linux/pwm_backlight.h>
+ #include <linux/platform_data/s3c-hsotg.h>
+#include <drm/exynos_drm.h>

#include <video/platform_lcd.h>
#include <media/m5mols.h>
diff --cc arch/arm/mach-exynos/mach-universal_c210.c
index 00c1a7b,bc8bf3b..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 <linux/platform_data/s3c-hsotg.h>
+#include <drm/exynos_drm.h>

#include <asm/mach/arch.h>
#include <asm/hardware/gic.h>

Attachment: pgp00000.pgp
Description: PGP signature