summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/board-harmony.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-06-20 10:25:13 -0600
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:45:58 -0800
commitadbed9e5e94f4a0e328d1732278e1b779c11bc42 (patch)
tree1a39fdef8850f1b604f894f6a8950d2d3f2c4072 /arch/arm/mach-tegra/board-harmony.c
parent2122aefddab1a814cccc426bc0afac1ca969427c (diff)
ARM: Tegra: Harmony: Remove duplicate SDHCI registrations
Tegra SDHCI devices were being registered through both harmony_devices[] and board-harmony-sdhci.c. The latter is mostly duplicate code, so just use the simpler logic already in board-harmony.c, and which is upstream. Signed-off-by: Stephen Warren <swarren@nvidia.com> Change-Id: Ib8c4e612541cbc299335f9770a463fccb384b9ce Rebase-Id: R789721008a0cfb2c8faa03ee59c2b56f2c075c3e
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
-rw-r--r--arch/arm/mach-tegra/board-harmony.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c
index dd2f818d850d..00f80e47b9e1 100644
--- a/arch/arm/mach-tegra/board-harmony.c
+++ b/arch/arm/mach-tegra/board-harmony.c
@@ -367,7 +367,6 @@ static void __init tegra_harmony_init(void)
harmony_i2c_init();
harmony_regulator_init();
harmony_panel_init();
- harmony_sdhci_init();
}
MACHINE_START(HARMONY, "harmony")