Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248847
b: refs/heads/master
c: 27362d4
h: refs/heads/master
i:
  248845: a154e12
  248843: c4697a6
  248839: 2eebdb6
  248831: 9b1fade
v: v3
  • Loading branch information
Jingoo Han authored and Greg Kroah-Hartman committed May 10, 2011
1 parent f7b2493 commit a4ad25f
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: c851e83f00f6d343ff7e7405f6f50eb3ba288a2c
refs/heads/master: 27362d467b3d9955f6ae1737002dac8c0f99fdc7
6 changes: 3 additions & 3 deletions trunk/drivers/usb/host/ehci-s5p.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static const struct hc_driver s5p_ehci_hc_driver = {
.clear_tt_buffer_complete = ehci_clear_tt_buffer_complete,
};

static int s5p_ehci_probe(struct platform_device *pdev)
static int __devinit s5p_ehci_probe(struct platform_device *pdev)
{
struct s5p_ehci_platdata *pdata;
struct s5p_ehci_hcd *s5p_ehci;
Expand Down Expand Up @@ -158,7 +158,7 @@ static int s5p_ehci_probe(struct platform_device *pdev)
return err;
}

static int s5p_ehci_remove(struct platform_device *pdev)
static int __devexit s5p_ehci_remove(struct platform_device *pdev)
{
struct s5p_ehci_platdata *pdata = pdev->dev.platform_data;
struct s5p_ehci_hcd *s5p_ehci = platform_get_drvdata(pdev);
Expand Down Expand Up @@ -191,7 +191,7 @@ static void s5p_ehci_shutdown(struct platform_device *pdev)

static struct platform_driver s5p_ehci_driver = {
.probe = s5p_ehci_probe,
.remove = s5p_ehci_remove,
.remove = __devexit_p(s5p_ehci_remove),
.shutdown = s5p_ehci_shutdown,
.driver = {
.name = "s5p-ehci",
Expand Down

0 comments on commit a4ad25f

Please sign in to comment.