From a4ad25f70129a7372ef64d7982664c0cba19b58f Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Mon, 9 May 2011 15:28:39 +0900 Subject: [PATCH] --- yaml --- r: 248847 b: refs/heads/master c: 27362d467b3d9955f6ae1737002dac8c0f99fdc7 h: refs/heads/master i: 248845: a154e128d2eb5784b147918c389f9f9f4b313919 248843: c4697a645559c1464c757730df866be365accb6b 248839: 2eebdb6e5629517cc28b59cadaa07f2f2985a8fa 248831: 9b1fade141dab63225fb3d45078dd77e175fdfef v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/ehci-s5p.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf3244781215..449f81c07a1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c851e83f00f6d343ff7e7405f6f50eb3ba288a2c +refs/heads/master: 27362d467b3d9955f6ae1737002dac8c0f99fdc7 diff --git a/trunk/drivers/usb/host/ehci-s5p.c b/trunk/drivers/usb/host/ehci-s5p.c index 321a03301ad2..e3374c8f7b3f 100644 --- a/trunk/drivers/usb/host/ehci-s5p.c +++ b/trunk/drivers/usb/host/ehci-s5p.c @@ -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; @@ -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); @@ -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",