From 0858e0bace4be228539fea62a980112c5864a3ab Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 19 Dec 2012 15:43:40 -0700 Subject: [PATCH] --- yaml --- r: 353943 b: refs/heads/master c: ade1764ff5f03bea4bc848de5e6d3db0758ff15a h: refs/heads/master i: 353941: 4c254673491ccaa84e1e12af655e4c12c3c21d76 353939: 46f7dfdcdadfb7f40533fd5ee54f7c9e186c0b8c 353935: 8d98c9f4cfe4cbc5424476983aabebdef5a68f2b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 3 +-- trunk/drivers/staging/comedi/comedidev.h | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7985edb87ff2..326b1a5fa71d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f012463068dbe0be2680aca6c607f7c6f5f0cdf3 +refs/heads/master: ade1764ff5f03bea4bc848de5e6d3db0758ff15a diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index b67fb0dc7a7b..7d85f57f584b 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -363,7 +363,7 @@ static void comedi_set_subdevice_runflags(struct comedi_subdevice *s, spin_unlock_irqrestore(&s->spin_lock, flags); } -unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) +static unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) { unsigned long flags; unsigned runflags; @@ -373,7 +373,6 @@ unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s) spin_unlock_irqrestore(&s->spin_lock, flags); return runflags; } -EXPORT_SYMBOL(comedi_get_subdevice_runflags); bool comedi_is_subdevice_running(struct comedi_subdevice *s) { diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 791030d2d8b4..5127dc28d6f6 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -367,7 +367,6 @@ bool comedi_is_subdevice_running(struct comedi_subdevice *s); int comedi_check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist); -unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s); /* range stuff */