]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] S3C: Fix SDHCI setup compilation
authorBen Dooks <ben-linux@fluff.org>
Fri, 31 Oct 2008 16:29:19 +0000 (16:29 +0000)
committerBen Dooks <ben-linux@fluff.org>
Mon, 15 Dec 2008 23:54:21 +0000 (23:54 +0000)
Fix the compilation of the SDHCI configuration/setup
functions to depend on their respective configuration
variables.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
arch/arm/plat-s3c/include/plat/sdhci.h

index f6276f835be4b296cb592bad9fbe8c168fbe5f0b..c4ca3920ca4bde8abdd3b33a6d5ad8678246148f 100644 (file)
@@ -78,19 +78,28 @@ extern void s3c6410_setup_sdhci0_cfg_card(struct platform_device *dev,
                                           struct mmc_ios *ios,
                                           struct mmc_card *card);
 
+#ifdef CONFIG_S3C_DEV_HSMMC
 static inline void s3c6410_default_sdhci0(void)
 {
        s3c_hsmmc0_def_platdata.clocks = s3c6410_hsmmc_clksrcs;
        s3c_hsmmc0_def_platdata.cfg_gpio = s3c6410_setup_sdhci0_cfg_gpio;
        s3c_hsmmc0_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card;
 }
+#else
+static inline void s3c6410_default_sdhci0(void) { }
+#endif /* CONFIG_S3C_DEV_HSMMC */
 
+#ifdef CONFIG_S3C_DEV_HSMMC1
 static inline void s3c6410_default_sdhci1(void)
 {
        s3c_hsmmc1_def_platdata.clocks = s3c6410_hsmmc_clksrcs;
        s3c_hsmmc1_def_platdata.cfg_gpio = s3c6410_setup_sdhci1_cfg_gpio;
        s3c_hsmmc1_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card;
 }
+#else
+static inline void s3c6410_default_sdhci1(void) { }
+#endif /* CONFIG_S3C_DEV_HSMMC1 */
+
 #else
 static inline void s3c6410_default_sdhci0(void) { }
 static inline void s3c6410_default_sdhci1(void) { }