summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/README.atmel_mci2
-rw-r--r--doc/git-mailrc2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/README.atmel_mci b/doc/README.atmel_mci
index 0cbd909829..1ec4465ca0 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 */
diff --git a/doc/git-mailrc b/doc/git-mailrc
index 96f1d86e2b..bc5a814925 100644
--- a/doc/git-mailrc
+++ b/doc/git-mailrc
@@ -51,7 +51,7 @@ alias tegra uboot, Simon Glass <sjg@chromium.org>, Tom Warren <twarren@
alias tegra2 tegra
alias ti uboot, Sandeep Paulraj <s-paulraj@ti.com>, Tom Rini <trini@ti.com>
-alias avr32 uboot, reinhardm
+alias avr32 uboot, Andreas Bießmann <andreas.devel@googlemail.com>
alias bfin uboot, vapier
alias blackfin bfin