Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 197170
b: refs/heads/master
c: 1873643
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed May 11, 2010
1 parent 981b7cb commit 467d0f7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d58214b0b8662f1b27d538390ecc49bbea0cd754
refs/heads/master: 18736438ae4ab3d96602b92446e07cc03c024b02
8 changes: 8 additions & 0 deletions trunk/drivers/staging/comedi/comedi_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ MODULE_LICENSE("GPL");

#ifdef CONFIG_COMEDI_DEBUG
int comedi_debug;
EXPORT_SYMBOL(comedi_debug);
module_param(comedi_debug, int, 0644);
#endif

Expand Down Expand Up @@ -1975,6 +1976,7 @@ void comedi_error(const struct comedi_device *dev, const char *s)
printk(KERN_ERR "comedi%d: %s: %s\n", dev->minor,
dev->driver->driver_name, s);
}
EXPORT_SYMBOL(comedi_error);

void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
{
Expand Down Expand Up @@ -2017,6 +2019,7 @@ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
}
s->async->events = 0;
}
EXPORT_SYMBOL(comedi_event);

void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
unsigned bits)
Expand All @@ -2028,6 +2031,7 @@ void comedi_set_subdevice_runflags(struct comedi_subdevice *s, unsigned mask,
s->runflags |= (bits & mask);
spin_unlock_irqrestore(&s->spin_lock, flags);
}
EXPORT_SYMBOL(comedi_set_subdevice_runflags);

unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
{
Expand All @@ -2039,6 +2043,7 @@ unsigned comedi_get_subdevice_runflags(struct comedi_subdevice *s)
spin_unlock_irqrestore(&s->spin_lock, flags);
return runflags;
}
EXPORT_SYMBOL(comedi_get_subdevice_runflags);

static int is_device_busy(struct comedi_device *dev)
{
Expand Down Expand Up @@ -2152,6 +2157,7 @@ int comedi_alloc_board_minor(struct device *hardware_device)
}
return i;
}
EXPORT_SYMBOL_GPL(comedi_alloc_board_minor);

void comedi_free_board_minor(unsigned minor)
{
Expand All @@ -2177,6 +2183,7 @@ 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)
Expand Down Expand Up @@ -2286,6 +2293,7 @@ struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor)
spin_unlock_irqrestore(&comedi_file_info_table_lock, flags);
return info;
}
EXPORT_SYMBOL_GPL(comedi_get_device_file_info);

static int resize_async_buffer(struct comedi_device *dev,
struct comedi_subdevice *s,
Expand Down
10 changes: 0 additions & 10 deletions trunk/drivers/staging/comedi/comedi_ksyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,16 @@
#include "comedidev.h"

/* for drivers */
EXPORT_SYMBOL(comedi_error);
EXPORT_SYMBOL(comedi_event);
EXPORT_SYMBOL(comedi_get_subdevice_runflags);
EXPORT_SYMBOL(comedi_set_subdevice_runflags);
EXPORT_SYMBOL(range_bipolar10);
EXPORT_SYMBOL(range_bipolar5);
EXPORT_SYMBOL(range_bipolar2_5);
EXPORT_SYMBOL(range_unipolar10);
EXPORT_SYMBOL(range_unipolar5);
EXPORT_SYMBOL(range_unknown);
#ifdef CONFIG_COMEDI_DEBUG
EXPORT_SYMBOL(comedi_debug);
#endif
EXPORT_SYMBOL_GPL(comedi_alloc_board_minor);
EXPORT_SYMBOL_GPL(comedi_free_board_minor);
EXPORT_SYMBOL_GPL(comedi_pci_auto_config);
EXPORT_SYMBOL_GPL(comedi_pci_auto_unconfig);
EXPORT_SYMBOL_GPL(comedi_usb_auto_config);
EXPORT_SYMBOL_GPL(comedi_usb_auto_unconfig);

/* for kcomedilib */
EXPORT_SYMBOL(check_chanlist);
EXPORT_SYMBOL_GPL(comedi_get_device_file_info);

0 comments on commit 467d0f7

Please sign in to comment.