aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-10-31 12:29:19 -0400
committerBen Dooks <ben-linux@fluff.org>2008-12-15 18:54:21 -0500
commit713e9dede63c775cb42c63178a6447f2c28ec2cd (patch)
tree75b447c6980e934a0cbf78506373cd617c4e3077
parentd6bc5f70e04168a3240f3ad7948415798128b949 (diff)
[ARM] S3C: Fix SDHCI setup compilation
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>
-rw-r--r--arch/arm/plat-s3c/include/plat/sdhci.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/sdhci.h b/arch/arm/plat-s3c/include/plat/sdhci.h
index f6276f835be4..c4ca3920ca4b 100644
--- a/arch/arm/plat-s3c/include/plat/sdhci.h
+++ b/arch/arm/plat-s3c/include/plat/sdhci.h
@@ -78,13 +78,18 @@ extern void s3c6410_setup_sdhci0_cfg_card(struct platform_device *dev,
78 struct mmc_ios *ios, 78 struct mmc_ios *ios,
79 struct mmc_card *card); 79 struct mmc_card *card);
80 80
81#ifdef CONFIG_S3C_DEV_HSMMC
81static inline void s3c6410_default_sdhci0(void) 82static inline void s3c6410_default_sdhci0(void)
82{ 83{
83 s3c_hsmmc0_def_platdata.clocks = s3c6410_hsmmc_clksrcs; 84 s3c_hsmmc0_def_platdata.clocks = s3c6410_hsmmc_clksrcs;
84 s3c_hsmmc0_def_platdata.cfg_gpio = s3c6410_setup_sdhci0_cfg_gpio; 85 s3c_hsmmc0_def_platdata.cfg_gpio = s3c6410_setup_sdhci0_cfg_gpio;
85 s3c_hsmmc0_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card; 86 s3c_hsmmc0_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card;
86} 87}
88#else
89static inline void s3c6410_default_sdhci0(void) { }
90#endif /* CONFIG_S3C_DEV_HSMMC */
87 91
92#ifdef CONFIG_S3C_DEV_HSMMC1
88static inline void s3c6410_default_sdhci1(void) 93static inline void s3c6410_default_sdhci1(void)
89{ 94{
90 s3c_hsmmc1_def_platdata.clocks = s3c6410_hsmmc_clksrcs; 95 s3c_hsmmc1_def_platdata.clocks = s3c6410_hsmmc_clksrcs;
@@ -92,6 +97,10 @@ static inline void s3c6410_default_sdhci1(void)
92 s3c_hsmmc1_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card; 97 s3c_hsmmc1_def_platdata.cfg_card = s3c6410_setup_sdhci0_cfg_card;
93} 98}
94#else 99#else
100static inline void s3c6410_default_sdhci1(void) { }
101#endif /* CONFIG_S3C_DEV_HSMMC1 */
102
103#else
95static inline void s3c6410_default_sdhci0(void) { } 104static inline void s3c6410_default_sdhci0(void) { }
96static inline void s3c6410_default_sdhci1(void) { } 105static inline void s3c6410_default_sdhci1(void) { }
97#endif /* CONFIG_S3C6410_SETUP_SDHCI */ 106#endif /* CONFIG_S3C6410_SETUP_SDHCI */