diff --git a/[refs] b/[refs] index 2e86b43d4b05..f19c5daa9f2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11d1488b01b803254842b756ff7662085b37970e +refs/heads/master: 1ebbe3d31fd96865b4d4874f3c74fef0e386fb79 diff --git a/trunk/drivers/mmc/host/atmel-mci.c b/trunk/drivers/mmc/host/atmel-mci.c index caae967dcafe..c0a0659261aa 100644 --- a/trunk/drivers/mmc/host/atmel-mci.c +++ b/trunk/drivers/mmc/host/atmel-mci.c @@ -603,8 +603,8 @@ static void atmci_pdc_set_single_buf(struct atmel_mci *host, } if (buf_nb == PDC_SECOND_BUF) { - pointer_reg += 0x10; - counter_reg += 0x10; + pointer_reg += ATMEL_PDC_SCND_BUF_OFF; + counter_reg += ATMEL_PDC_SCND_BUF_OFF; } atmci_writel(host, pointer_reg, sg_dma_address(host->sg)); diff --git a/trunk/include/linux/atmel_pdc.h b/trunk/include/linux/atmel_pdc.h index 5058a31d2ce8..63499ce806ea 100644 --- a/trunk/include/linux/atmel_pdc.h +++ b/trunk/include/linux/atmel_pdc.h @@ -33,4 +33,6 @@ #define ATMEL_PDC_PTSR 0x124 /* Transfer Status Register */ +#define ATMEL_PDC_SCND_BUF_OFF 0x10 /* Offset between first and second buffer registers */ + #endif