Revert "ARM: 7220/1: mmc: mmci: Fixup error handling for dma"
commit80375fc467ecef560d6c73bf04752b02f6204ada
authorHerton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Tue, 24 Jan 2012 18:00:16 +0000 (24 16:00 -0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Feb 2012 17:26:51 +0000 (3 09:26 -0800)
tree5e047aceb9aef6f48c45ad842c3b6934653fe00c
parent4d385100b02a7b255797ac2066ea043a6f60e3dc
Revert "ARM: 7220/1: mmc: mmci: Fixup error handling for dma"

This reverts commit c8cdf3f97d34d906e0519d5cbc2ab3f81269d0b4, applied on
linux 2.6.32.53 stable release, as it can introduce the following build
error while building 2.6.32.y on armel:

linux-2.6.32/drivers/mmc/host/mmci.c: In function 'mmci_cmd_irq':
linux-2.6.32/drivers/mmc/host/mmci.c:237: error: implicit declaration of function 'dma_inprogress'
linux-2.6.32/drivers/mmc/host/mmci.c:238: error: implicit declaration of function 'mmci_dma_data_error'

Aparently the commit was wrongly pushed into 2.6.32, since it depends on
commit c8ebae37 ("ARM: mmci: add dmaengine-based DMA support"), not
present on 2.6.32.

Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/mmc/host/mmci.c