Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316665
b: refs/heads/master
c: 7fd63cc
h: refs/heads/master
i:
  316663: 6111123
v: v3
  • Loading branch information
Uwe Kleine-König authored and Vinod Koul committed Jul 16, 2012
1 parent d8ba3df commit 307b5a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f8609c2b528331c38293bb8082a91701256d3fc1
refs/heads/master: 7fd63ccdad72335fd820b0ce5cb8edb6ca6419ce
4 changes: 2 additions & 2 deletions trunk/drivers/dma/at_hdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,7 @@ static const struct platform_device_id atdma_devtypes[] = {
}
};

static inline struct at_dma_platform_data * __init at_dma_get_driver_data(
static inline const struct at_dma_platform_data * __init at_dma_get_driver_data(
struct platform_device *pdev)
{
if (pdev->dev.of_node) {
Expand Down Expand Up @@ -1254,7 +1254,7 @@ static int __init at_dma_probe(struct platform_device *pdev)
int irq;
int err;
int i;
struct at_dma_platform_data *plat_dat;
const struct at_dma_platform_data *plat_dat;

/* setup platform data for each SoC */
dma_cap_set(DMA_MEMCPY, at91sam9rl_config.cap_mask);
Expand Down

0 comments on commit 307b5a7

Please sign in to comment.