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 /doc/README.atmel_mci | |
| parent | 6ae38b8c583c61f00c2fe9904cafa81932c7faaf (diff) | |
| parent | a7a564c55c3b53e5af091b82070ca1f67cba70f7 (diff) | |
| download | u-boot-imx-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.zip u-boot-imx-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.tar.gz u-boot-imx-6e94125f9ccde8e7f8f94902b8d253bda5bb68c8.tar.bz2 | |
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 'doc/README.atmel_mci')
| -rw-r--r-- | doc/README.atmel_mci | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/README.atmel_mci b/doc/README.atmel_mci index 0cbd909..1ec4465 100644 --- a/doc/README.atmel_mci +++ b/doc/README.atmel_mci @@ -20,7 +20,7 @@ board/SoC specific manner before the driver is initialized: example: this is added to at91sam9260_devices.c: -#if defined(CONFIG_ATMEL_MCI) || defined(CONFIG_GENERIC_ATMEL_MCI) +#if defined(CONFIG_GENERIC_ATMEL_MCI) void at91_mci_hw_init(void) { at91_set_a_periph(AT91_PIO_PORTA, 8, PUP); /* MCCK */ |