diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-17 22:00:43 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-17 22:00:43 -0500 |
| commit | 67f4efdce7d85282fbd5832cddc80a07eb89b6d6 (patch) | |
| tree | 9a1771ef13b27abdf8cf172e5b7556ab93e5c48c /include/linux/mmc/dw_mmc.h | |
| parent | c53aa5058ad5ca8876a47d6639ad4d4f2c5ed584 (diff) | |
| parent | f4a75d2eb7b1e2206094b901be09adb31ba63681 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/mmc/dw_mmc.h')
| -rw-r--r-- | include/linux/mmc/dw_mmc.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 7c6a1139d8fa..96531664a061 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -137,7 +137,7 @@ struct dw_mci { dma_addr_t sg_dma; void *sg_cpu; - struct dw_mci_dma_ops *dma_ops; + const struct dw_mci_dma_ops *dma_ops; #ifdef CONFIG_MMC_DW_IDMAC unsigned int ring_size; #else @@ -162,7 +162,7 @@ struct dw_mci { u16 data_offset; struct device *dev; struct dw_mci_board *pdata; - struct dw_mci_drv_data *drv_data; + const struct dw_mci_drv_data *drv_data; void *priv; struct clk *biu_clk; struct clk *ciu_clk; @@ -186,7 +186,7 @@ struct dw_mci { struct regulator *vmmc; /* Power regulator */ unsigned long irq_flags; /* IRQ flags */ - unsigned int irq; + int irq; }; /* DMA ops for Internal/External DMAC interface */ |