Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316643
b: refs/heads/master
c: 0272e93
h: refs/heads/master
i:
  316641: aa30454
  316639: ec47fe3
v: v3
  • Loading branch information
Andy Shevchenko authored and Vinod Koul committed Jun 21, 2012
1 parent be56f13 commit aa6037f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 4c2d56c574db84ef6e0101f28a37c044e89b0302
refs/heads/master: 0272e93f364eac1a30f2831adcaca3dd633d5f14
6 changes: 3 additions & 3 deletions trunk/drivers/dma/dw_dmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1375,7 +1375,7 @@ static void dw_dma_off(struct dw_dma *dw)
dw->chan[i].initialized = false;
}

static int __init dw_probe(struct platform_device *pdev)
static int __devinit dw_probe(struct platform_device *pdev)
{
struct dw_dma_platform_data *pdata;
struct resource *io;
Expand Down Expand Up @@ -1512,7 +1512,7 @@ static int __init dw_probe(struct platform_device *pdev)
return err;
}

static int __exit dw_remove(struct platform_device *pdev)
static int __devexit dw_remove(struct platform_device *pdev)
{
struct dw_dma *dw = platform_get_drvdata(pdev);
struct dw_dma_chan *dwc, *_dwc;
Expand Down Expand Up @@ -1591,7 +1591,7 @@ MODULE_DEVICE_TABLE(of, dw_dma_id_table);
#endif

static struct platform_driver dw_driver = {
.remove = __exit_p(dw_remove),
.remove = __devexit_p(dw_remove),
.shutdown = dw_shutdown,
.driver = {
.name = "dw_dmac",
Expand Down

0 comments on commit aa6037f

Please sign in to comment.