From 9fa7b1310ff9ed801a637da5459d516108641b85 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 3 May 2010 15:27:52 -0700 Subject: [PATCH] --- yaml --- r: 197200 b: refs/heads/master c: 09372df0dff51121e772ca5870fb565a08840c86 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedidev.h | 2 -- trunk/drivers/staging/comedi/drivers.c | 1 - trunk/drivers/staging/comedi/internal.h | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 40081d2858e7..23ad97fb3502 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e8c604821b372c6e98e9632f5617913bf92ae45 +refs/heads/master: 09372df0dff51121e772ca5870fb565a08840c86 diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index c72fd15e6a55..3ca5832ad6f9 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -495,8 +495,6 @@ static inline unsigned comedi_buf_read_n_allocated(struct comedi_async *async) return async->buf_read_alloc_count - async->buf_read_count; } -void comedi_reset_async_buf(struct comedi_async *async); - static inline void *comedi_aux_data(int options[], int n) { unsigned long address; diff --git a/trunk/drivers/staging/comedi/drivers.c b/trunk/drivers/staging/comedi/drivers.c index 475778fb6801..f68fab9c5509 100644 --- a/trunk/drivers/staging/comedi/drivers.c +++ b/trunk/drivers/staging/comedi/drivers.c @@ -811,7 +811,6 @@ void comedi_reset_async_buf(struct comedi_async *async) async->events = 0; } -EXPORT_SYMBOL(comedi_reset_async_buf); int comedi_auto_config(struct device *hardware_device, const char *board_name, const int *options, unsigned num_options) diff --git a/trunk/drivers/staging/comedi/internal.h b/trunk/drivers/staging/comedi/internal.h index 4b6065adb7ea..7068a38d7f3c 100644 --- a/trunk/drivers/staging/comedi/internal.h +++ b/trunk/drivers/staging/comedi/internal.h @@ -1,3 +1,4 @@ int comedi_alloc_board_minor(struct device *hardware_device); void comedi_free_board_minor(unsigned minor); +void comedi_reset_async_buf(struct comedi_async *async);