diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-03-17 21:50:59 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-17 21:50:59 +0100 |
| commit | 6e94125f9ccde8e7f8f94902b8d253bda5bb68c8 (patch) | |
| tree | 689b740e1d175a5d2dfbce89d2ebb0e9350a1da3 /include/mmc.h | |
| parent | 6ae38b8c583c61f00c2fe9904cafa81932c7faaf (diff) | |
| parent | a7a564c55c3b53e5af091b82070ca1f67cba70f7 (diff) | |
| download | olio-uboot-2014.01-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.tar.xz olio-uboot-2014.01-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-avr32
* 'master' of git://git.denx.de/u-boot-avr32:
atmel_mci.h: remove outdated register macros
doc/git-mailrc: add <me> to avr32 alias
ATMEL: remove old atmel_mci driver
ATMEL: use generic mmc framework
Diffstat (limited to 'include/mmc.h')
| -rw-r--r-- | include/mmc.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/mmc.h b/include/mmc.h index 30c237535..f52df70ad 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -322,7 +322,6 @@ int mmc_switch_part(int dev_num, unsigned int part_num); int mmc_getcd(struct mmc *mmc); #ifdef CONFIG_GENERIC_MMC -int atmel_mci_init(void *regs); #define mmc_host_is_spi(mmc) ((mmc)->host_caps & MMC_MODE_SPI) struct mmc *mmc_spi_init(uint bus, uint cs, uint speed, uint mode); #else |