Skip to content

Commit

Permalink
msm: Remove extraneous ffa device check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Brown committed Mar 31, 2011
1 parent 0ce790e commit 62f0988
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/arm/mach-msm/board-qsd8x50.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 62f0988

Please sign in to comment.