diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-05-12 14:42:41 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-05-12 14:42:41 -0700 |
| commit | cd9f5bed776f2ed378b13df34c17c8c227c30fcd (patch) | |
| tree | 9c33883eacb584a0708657d276ac8a4a30b537e9 | |
| parent | a31af49e590942de7a2ebdad8e9ae02dfe888070 (diff) | |
iio: Fix merge flub that caused build issuestracking-linaro-android-3.15-llct-20140602.0tracking-linaro-android-3.15-llct-20140529.0tracking-linaro-android-3.15-llct-20140523.0tracking-linaro-android-3.15-llct-20140515.0
There was an apparent merge flub that caused build failures.
This patch removes the duplicated structure element.
Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
| -rw-r--r-- | drivers/iio/industrialio-event.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c index f386dce7e107..e127d39d1967 100644 --- a/drivers/iio/industrialio-event.c +++ b/drivers/iio/industrialio-event.c @@ -41,7 +41,6 @@ struct iio_event_interface { struct list_head dev_attr_list; unsigned long flags; struct attribute_group group; - struct mutex read_lock; }; /** |