From 6d665517a0a6e3530b7dcc616da8e19de71bd893 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Tue, 25 Jan 2011 15:07:19 -0800 Subject: [PATCH] --- yaml --- r: 232408 b: refs/heads/master c: 4f542e3dd90a96ee0f8fcb8173cb4104f5f753e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pps/clients/pps_parport.c | 2 +- trunk/drivers/pps/generators/pps_gen_parport.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 200f49117213..b54b0c297458 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a783ac4453405b579ab7732ba3c0efc07a4b7a61 +refs/heads/master: 4f542e3dd90a96ee0f8fcb8173cb4104f5f753e6 diff --git a/trunk/drivers/pps/clients/pps_parport.c b/trunk/drivers/pps/clients/pps_parport.c index 32221efd9ca9..c571d6dd8f61 100644 --- a/trunk/drivers/pps/clients/pps_parport.c +++ b/trunk/drivers/pps/clients/pps_parport.c @@ -163,7 +163,7 @@ static void parport_attach(struct parport *port) } device->pardev = parport_register_device(port, KBUILD_MODNAME, - NULL, NULL, parport_irq, 0, device); + NULL, NULL, parport_irq, PARPORT_FLAG_EXCL, device); if (!device->pardev) { pr_err("couldn't register with %s\n", port->name); goto err_free; diff --git a/trunk/drivers/pps/generators/pps_gen_parport.c b/trunk/drivers/pps/generators/pps_gen_parport.c index 5c32f8dacf56..b93af3ebb5ba 100644 --- a/trunk/drivers/pps/generators/pps_gen_parport.c +++ b/trunk/drivers/pps/generators/pps_gen_parport.c @@ -198,7 +198,7 @@ static void parport_attach(struct parport *port) } device.pardev = parport_register_device(port, KBUILD_MODNAME, - NULL, NULL, NULL, 0, &device); + NULL, NULL, NULL, PARPORT_FLAG_EXCL, &device); if (!device.pardev) { pr_err("couldn't register with %s\n", port->name); return;