diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:21:36 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 18:30:18 +1100 |
| commit | 8b639e07efdb1b21ca60eeb3f8f5ac5038761200 (patch) | |
| tree | dd326f297c6c26c65477eea299667cf2d481fdd8 /drivers/staging/iio/trigger_consumer.h | |
| parent | 3a647a6ce4006ea8b84e4eaa6e18204cd911ed99 (diff) | |
| parent | 1f0f7a7df20bd69cb8553136613bda38dcddfcb1 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/net/wireless/Kconfig
Diffstat (limited to 'drivers/staging/iio/trigger_consumer.h')
| -rw-r--r-- | drivers/staging/iio/trigger_consumer.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/iio/trigger_consumer.h b/drivers/staging/iio/trigger_consumer.h index 4c7f527dc79f..a02d70b0d24a 100644 --- a/drivers/staging/iio/trigger_consumer.h +++ b/drivers/staging/iio/trigger_consumer.h @@ -10,12 +10,13 @@ #ifdef CONFIG_IIO_TRIGGER /** - * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers. + * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers * @dev_info: iio_dev associated with the device that will consume the trigger **/ int iio_device_register_trigger_consumer(struct iio_dev *dev_info); + /** - * iio_device_unregister_trigger_consumer() - reverse the registration process. + * iio_device_unregister_trigger_consumer() - reverse the registration process * @dev_info: iio_dev associated with the device that consumed the trigger **/ int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info); @@ -23,13 +24,14 @@ int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info); #else /** - * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers. + * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers * @dev_info: iio_dev associated with the device that will consume the trigger **/ int iio_device_register_trigger_consumer(struct iio_dev *dev_info) { return 0; }; + /** * iio_device_unregister_trigger_consumer() - reverse the registration process * @dev_info: iio_dev associated with the device that consumed the trigger |