diff options
| author | David Brown <davidb@codeaurora.org> | 2011-03-29 11:48:45 -0700 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-03-31 13:15:40 -0700 |
| commit | 62f0988ee5280ac03f787e3abd70bd91366e3778 (patch) | |
| tree | 922eb2e1994f30632610d76b99e4d7cf76d869dc | |
| parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
| download | linux-62f0988ee5280ac03f787e3abd70bd91366e3778.tar.gz linux-62f0988ee5280ac03f787e3abd70bd91366e3778.tar.bz2 linux-62f0988ee5280ac03f787e3abd70bd91366e3778.zip | |
msm: Remove extraneous ffa device check
The qsd8x50 board file contains a few references to machine_is_...
macros that are otherwise unused, and contain no machine definition.
The recent purge of unused machine definitions breaks the compilation
of this target.
Since the machine cannot ever be used, just remove the bogus checks.
Signed-off-by: David Brown <davidb@codeaurora.org>
| -rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index 7f568611547e..6a96911b0ad5 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@ -160,10 +160,7 @@ static struct msm_mmc_platform_data qsd8x50_sdc1_data = { static void __init qsd8x50_init_mmc(void) { - if (machine_is_qsd8x50_ffa() || machine_is_qsd8x50a_ffa()) - vreg_mmc = vreg_get(NULL, "gp6"); - else - vreg_mmc = vreg_get(NULL, "gp5"); + vreg_mmc = vreg_get(NULL, "gp5"); if (IS_ERR(vreg_mmc)) { pr_err("vreg get for vreg_mmc failed (%ld)\n", |