From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 3 Dec 2009 21:53:10 +0000 (+0000)
Subject: ARM: Merge next-s3c64xx-updates
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=009f742bded4cc7c89b901d59452fbfc0eb292c5;p=linux-beck.git

ARM: Merge next-s3c64xx-updates

Merge branch 'next-s3c64xx-updates' into for-rmk

Conflicts:

	arch/arm/plat-s3c/dev-hsmmc2.c
	arch/arm/plat-s3c/include/plat/sdhci.h
---

009f742bded4cc7c89b901d59452fbfc0eb292c5
diff --cc arch/arm/plat-s3c/dev-hsmmc2.c
index 082e55a78ad7,33506c12b44c..824580bc0e06
--- a/arch/arm/plat-s3c/dev-hsmmc2.c
+++ b/arch/arm/plat-s3c/dev-hsmmc2.c
@@@ -1,6 -1,9 +1,10 @@@
  /* linux/arch/arm/plat-s3c/dev-hsmmc2.c
   *
 + * Copyright (c) 2009 Samsung Electronics
+  * Copyright (c) 2009 Maurus Cuelenaere
+  *
+  * Based on arch/arm/plat-s3c/dev-hsmmc1.c
+  * original file Copyright (c) 2008 Simtec Electronics
   *
   * S3C series device definition for hsmmc device 2
   *
diff --cc arch/arm/plat-s3c/include/plat/sdhci.h
index c71d07861840,d5a3b41bddb9..53198673b6bd
--- a/arch/arm/plat-s3c/include/plat/sdhci.h
+++ b/arch/arm/plat-s3c/include/plat/sdhci.h
@@@ -71,9 -71,7 +71,10 @@@ extern struct s3c_sdhci_platdata s3c_hs
  
  extern void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
  extern void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
 +extern void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *, int w);
 +extern void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *, int w);
 +extern void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
+ extern void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *, int w);
  
  /* S3C6400 SDHCI setup */