From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 08:18:02 +0000 (+1100)
Subject: Merge remote-tracking branch 'gpio/for-next'
X-Git-Tag: next-20140106~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=234baf9f518b9ff163de030799d8629e0607722c;p=karo-tx-linux.git

Merge remote-tracking branch 'gpio/for-next'
---

234baf9f518b9ff163de030799d8629e0607722c
diff --cc arch/arm/mach-s3c64xx/mach-mini6410.c
index 97ae4703cb78,14c96ee5a3fe..a564aeea57a4
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@@ -36,10 -36,9 +36,11 @@@
  #include <plat/devs.h>
  #include <plat/fb.h>
  #include <linux/platform_data/mtd-nand-s3c2410.h>
 +#include <linux/platform_data/mmc-sdhci-s3c.h>
  #include <plat/regs-serial.h>
 +#include <plat/sdhci.h>
  #include <linux/platform_data/touchscreen-s3c2410.h>
+ #include <linux/platform_data/gpio-samsung-s3c64xx.h>
  
  #include <video/platform_lcd.h>
  #include <video/samsung_fimd.h>