From a9336c717ed4a26c1e17b69dc230d1dab4bc8e01 Mon Sep 17 00:00:00 2001 From: Ludovic Desroches Date: Wed, 16 May 2012 17:51:59 +0200 Subject: [PATCH] --- yaml --- r: 307973 b: refs/heads/master c: 0caaa9539adcff38ce12e99f0ab25645e7eb3eea h: refs/heads/master i: 307971: 682fe8fc197f9d96a1737bc8ab89d33c275ef23f v: v3 --- [refs] | 2 +- trunk/Documentation/feature-removal-schedule.txt | 11 +++++++++++ trunk/drivers/mmc/host/Kconfig | 7 +++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 268a9f466ce4..357ee05469f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db35f83ef47b5f180f2670d11f5f93992314ea09 +refs/heads/master: 0caaa9539adcff38ce12e99f0ab25645e7eb3eea diff --git a/trunk/Documentation/feature-removal-schedule.txt b/trunk/Documentation/feature-removal-schedule.txt index 03ca210406ed..d212f83f17cf 100644 --- a/trunk/Documentation/feature-removal-schedule.txt +++ b/trunk/Documentation/feature-removal-schedule.txt @@ -539,3 +539,14 @@ When: 3.6 Why: setitimer is not returning -EFAULT if user pointer is NULL. This violates the spec. Who: Sasikantha Babu + +---------------------------- + +What: at91-mci driver ("CONFIG_MMC_AT91") +When: 3.7 +Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support + was added to atmel-mci as a first step to support more chips. + Then at91-mci was kept only for old IP versions (on at91rm9200 and + at91sam9261). The support of these IP versions has just been added + to atmel-mci, so atmel-mci can be used for all chips. +Who: Ludovic Desroches diff --git a/trunk/drivers/mmc/host/Kconfig b/trunk/drivers/mmc/host/Kconfig index 9f1f5e2bbfef..aa131b32e3b2 100644 --- a/trunk/drivers/mmc/host/Kconfig +++ b/trunk/drivers/mmc/host/Kconfig @@ -278,10 +278,13 @@ choice Choose which driver to use for the Atmel MCI Silicon config MMC_AT91 - tristate "AT91 SD/MMC Card Interface support" + tristate "AT91 SD/MMC Card Interface support (DEPRECATED)" depends on ARCH_AT91 help - This selects the AT91 MCI controller. + This selects the AT91 MCI controller. This driver will + be removed soon (for more information have a look to + Documentation/feature-removal-schedule.txt). Please use + MMC_ATMEL_MCI. If unsure, say N.