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

diff --cc arch/arm/plat-s3c/dev-hsmmc2.c
index 082e55a78ad7a9510f8456d6bcde0f4cde794384,33506c12b44c5930468e98d42d740da9c3a81221..824580bc0e06d4761c7a13d3994159eb4a76e754
--- 1/arch/arm/plat-s3c/dev-hsmmc2.c
--- 2/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 c71d0786184096fb6027e28fbecb17b496739699,d5a3b41bddb9b17fdd5c97cc620d7b15ca4e584a..53198673b6bde4677886a017da928c2cce5dda7e
--- 1/arch/arm/plat-s3c/include/plat/sdhci.h
--- 2/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 */