From 3de9e2d1cfebe25b64d2a6de1822b273ec9279b5 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Fri, 11 Dec 2009 21:50:47 -0800 Subject: [PATCH] --- yaml --- r: 177071 b: refs/heads/master c: a0ee2037e10d7dce47caabbac19766d00632cccd h: refs/heads/master i: 177069: bb9f9108888b5889c7cc018d0934eb4d5b37f6d6 177067: 431cd14b3df855212b2a31e3a7bc64a132a9067e 177063: 556fa01f2e529ceb2c93fe536e642fad21ebdcea 177055: 7182b98d9def4ebba22ef536038331320b5d541e v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/gscps2.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f3593fc52a9d..383da048d7b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1def7afa748b964aeb0033d0cb78aabf3d3f3683 +refs/heads/master: a0ee2037e10d7dce47caabbac19766d00632cccd diff --git a/trunk/drivers/input/serio/gscps2.c b/trunk/drivers/input/serio/gscps2.c index bd0f92d9f40f..06addfa7cc47 100644 --- a/trunk/drivers/input/serio/gscps2.c +++ b/trunk/drivers/input/serio/gscps2.c @@ -6,7 +6,7 @@ * Copyright (c) 2002 Thibaut Varene * * Pieces of code based on linux-2.4's hp_mouse.c & hp_keyb.c - * Copyright (c) 1999 Alex deVries + * Copyright (c) 1999 Alex deVries * Copyright (c) 1999-2000 Philipp Rumpf * Copyright (c) 2000 Xavier Debacker * Copyright (c) 2000-2001 Thomas Marteau @@ -326,7 +326,7 @@ static void gscps2_close(struct serio *port) * @return: success/error report */ -static int __init gscps2_probe(struct parisc_device *dev) +static int __devinit gscps2_probe(struct parisc_device *dev) { struct gscps2port *ps2port; struct serio *serio; @@ -443,7 +443,7 @@ static struct parisc_driver parisc_ps2_driver = { .name = "gsc_ps2", .id_table = gscps2_device_tbl, .probe = gscps2_probe, - .remove = gscps2_remove, + .remove = __devexit_p(gscps2_remove), }; static int __init gscps2_init(void)