diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-06 16:54:42 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-06 16:54:42 +0100 |
| commit | 375a4496ff250baf6e4b845c1ebf40e4b3c409a3 (patch) | |
| tree | 5ca8593cadc7a3d47e275f2de5288e2314cb0361 /arch/arm/include/asm/arch-s5pc1xx/mmc.h | |
| parent | c35cf8dc9fd90ff108abe08527df042bcd29a02f (diff) | |
| parent | 55f2118c11ff933e272c1084f93e72ff719a269b (diff) | |
| download | u-boot-imx-375a4496ff250baf6e4b845c1ebf40e4b3c409a3.zip u-boot-imx-375a4496ff250baf6e4b845c1ebf40e4b3c409a3.tar.gz u-boot-imx-375a4496ff250baf6e4b845c1ebf40e4b3c409a3.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-s5pc1xx/mmc.h')
| -rw-r--r-- | arch/arm/include/asm/arch-s5pc1xx/mmc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h index 55ff10b..dd473c8 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -55,7 +55,7 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width); -static inline unsigned int s5p_mmc_init(int index, int bus_width) +static inline int s5p_mmc_init(int index, int bus_width) { unsigned int base = samsung_get_base_mmc() + (S5P_MMC_DEV_OFFSET * index); |