git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ixp4xx-for-armsoc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git]
/
drivers
/
mmc
/
host
/
pxamci.c
diff --git
a/drivers/mmc/host/pxamci.c
b/drivers/mmc/host/pxamci.c
index c907bf502a123b5b588d8a70e3446fca1da20a66..c1d3f0e3892131a46192a68e12807d39b1a36c69 100644
(file)
--- a/
drivers/mmc/host/pxamci.c
+++ b/
drivers/mmc/host/pxamci.c
@@
-162,7
+162,7
@@
static void pxamci_dma_irq(void *param);
static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
{
struct dma_async_tx_descriptor *tx;
static void pxamci_setup_data(struct pxamci_host *host, struct mmc_data *data)
{
struct dma_async_tx_descriptor *tx;
- enum dma_
data
_direction direction;
+ enum dma_
transfer
_direction direction;
struct dma_slave_config config;
struct dma_chan *chan;
unsigned int nob = data->blocks;
struct dma_slave_config config;
struct dma_chan *chan;
unsigned int nob = data->blocks;