From 89189a62f013ec6fed5f2a8ec5dfacf1a6047820 Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Mon, 26 Dec 2011 17:57:37 +0100 Subject: [PATCH] --- yaml --- r: 288906 b: refs/heads/master c: 36b30d6138f4677514aca35ab76c20c1604baaad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/nvec/nvec_ps2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 91bd6e933ac8..9a73b5c97427 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a573298b81ffd05856ddaa222826471eabf3953b +refs/heads/master: 36b30d6138f4677514aca35ab76c20c1604baaad diff --git a/trunk/drivers/staging/nvec/nvec_ps2.c b/trunk/drivers/staging/nvec/nvec_ps2.c index 4be3d220a634..14a6f687cf75 100644 --- a/trunk/drivers/staging/nvec/nvec_ps2.c +++ b/trunk/drivers/staging/nvec/nvec_ps2.c @@ -98,7 +98,7 @@ static int __devinit nvec_mouse_probe(struct platform_device *pdev) struct nvec_chip *nvec = dev_get_drvdata(pdev->dev.parent); struct serio *ser_dev = kzalloc(sizeof(struct serio), GFP_KERNEL); - ser_dev->id.type = SERIO_8042; + ser_dev->id.type = SERIO_PS_PSTHRU; ser_dev->write = ps2_sendcommand; ser_dev->start = ps2_startstreaming; ser_dev->stop = ps2_stopstreaming;