diff options
| author | Tom Rini <trini@ti.com> | 2014-10-10 20:59:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-10 20:59:28 -0400 |
| commit | e89d623f099c44b0b166ccf46bce2e6a0b99c984 (patch) | |
| tree | da7fb5d7260b477a976519e580264ba1f86a866b /drivers/mmc | |
| parent | ed8271d11c5c7a31eb49f787fa25eece6b82bb9e (diff) | |
| parent | 3d420cbd355a5f09e4f113eb10579a264a8ef138 (diff) | |
| download | blackbird-obmc-uboot-e89d623f099c44b0b166ccf46bce2e6a0b99c984.tar.gz blackbird-obmc-uboot-e89d623f099c44b0b166ccf46bce2e6a0b99c984.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/s5p_sdhci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 2ff0ec2a42..637dd972a5 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -14,9 +14,7 @@ #include <asm/arch/mmc.h> #include <asm/arch/clk.h> #include <errno.h> -#ifdef CONFIG_OF_CONTROL #include <asm/arch/pinmux.h> -#endif static char *S5P_NAME = "SAMSUNG SDHCI"; static void s5p_sdhci_set_control_reg(struct sdhci_host *host) |
