From fb93e2f15a4a7ef2d1f4f564da056127f3671f66 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 May 2010 15:24:14 -0700 Subject: [PATCH] --- yaml --- r: 197199 b: refs/heads/master c: 9e8c604821b372c6e98e9632f5617913bf92ae45 h: refs/heads/master i: 197197: 90c2aced3963241ece985111843824fe01f851cb 197195: 360c6e762c2d95499f945ea24fd9c2b68f57e0ce 197191: 3ef7f6a147872c9de3b7da6dbebd47b071281d81 197183: 6d387a1d4d8e862ec62465ccd68e5a57470ea31a v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_fops.c | 1 - trunk/drivers/staging/comedi/comedidev.h | 1 - trunk/drivers/staging/comedi/internal.h | 1 + 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f53d35f94068..40081d2858e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 242e7ad91a067243d7ab63b6a25ed2e085733446 +refs/heads/master: 9e8c604821b372c6e98e9632f5617913bf92ae45 diff --git a/trunk/drivers/staging/comedi/comedi_fops.c b/trunk/drivers/staging/comedi/comedi_fops.c index 2634af2f33df..ce8e2549b8ff 100644 --- a/trunk/drivers/staging/comedi/comedi_fops.c +++ b/trunk/drivers/staging/comedi/comedi_fops.c @@ -2181,7 +2181,6 @@ void comedi_free_board_minor(unsigned minor) kfree(info); } } -EXPORT_SYMBOL_GPL(comedi_free_board_minor); int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s) diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 5f017c2383b3..c72fd15e6a55 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -522,7 +522,6 @@ static inline void *comedi_aux_data(int options[], int n) return (void *)address; } -void comedi_free_board_minor(unsigned minor); int comedi_alloc_subdevice_minor(struct comedi_device *dev, struct comedi_subdevice *s); void comedi_free_subdevice_minor(struct comedi_subdevice *s); diff --git a/trunk/drivers/staging/comedi/internal.h b/trunk/drivers/staging/comedi/internal.h index 4ced6bfa7e9c..4b6065adb7ea 100644 --- a/trunk/drivers/staging/comedi/internal.h +++ b/trunk/drivers/staging/comedi/internal.h @@ -1,2 +1,3 @@ int comedi_alloc_board_minor(struct device *hardware_device); +void comedi_free_board_minor(unsigned minor);