Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / staging / iio / chrdev.h

diff --git a/drivers/staging/iio/chrdev.h b/drivers/staging/iio/chrdev.h
index fd23bd1..98d1a2c 100644 (file)
--- a/drivers/staging/iio/chrdev.h
+++ b/drivers/staging/iio/chrdev.h
@@ -73,7 +73,6 @@ struct iio_shared_ev_pointer {
  * @det_events:                list of detected events
  * @max_events:                maximum number of events before new ones are dropped
  * @current_events:    number of events in detected list
- * @attr:              this chrdev's minor number sysfs attribute
  * @owner:             ensure the driver module owns the file, not iio
  * @private:           driver specific data
  * @_name:             used internally to store the sysfs name for minor id
@@ -88,7 +87,6 @@ struct iio_event_interface {
        struct iio_detected_event_list          det_events;
        int                                     max_events;
        int                                     current_events;
-       struct iio_chrdev_minor_attr            attr;
        struct module                           *owner;
        void                                    *private;
        char                                    _name[35];