From 2a7a0f11d8c77513acf99cf402f4b5ba23c8a171 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 11 Dec 2009 21:42:18 -0800 Subject: [PATCH] --- yaml --- r: 177070 b: refs/heads/master c: 1def7afa748b964aeb0033d0cb78aabf3d3f3683 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/altera_ps2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4f9bcc4483da..f3593fc52a9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e40ec6ff2f42b5516d77a5c34bfa6a9ce45834f4 +refs/heads/master: 1def7afa748b964aeb0033d0cb78aabf3d3f3683 diff --git a/trunk/drivers/input/serio/altera_ps2.c b/trunk/drivers/input/serio/altera_ps2.c index b328185b1cc2..457da76d4c83 100644 --- a/trunk/drivers/input/serio/altera_ps2.c +++ b/trunk/drivers/input/serio/altera_ps2.c @@ -79,7 +79,7 @@ static void altera_ps2_close(struct serio *io) /* * Add one device to this driver. */ -static int altera_ps2_probe(struct platform_device *pdev) +static int __devinit altera_ps2_probe(struct platform_device *pdev) { struct ps2if *ps2if; struct serio *serio; @@ -155,7 +155,7 @@ static int altera_ps2_probe(struct platform_device *pdev) /* * Remove one device from this driver. */ -static int altera_ps2_remove(struct platform_device *pdev) +static int __devexit altera_ps2_remove(struct platform_device *pdev) { struct ps2if *ps2if = platform_get_drvdata(pdev); @@ -175,7 +175,7 @@ static int altera_ps2_remove(struct platform_device *pdev) */ static struct platform_driver altera_ps2_driver = { .probe = altera_ps2_probe, - .remove = altera_ps2_remove, + .remove = __devexit_p(altera_ps2_remove), .driver = { .name = DRV_NAME, .owner = THIS_MODULE,