summaryrefslogtreecommitdiff
path: root/drivers/w1/w1.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 16:33:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 16:33:54 -0700
commitdd0aa67cd7cf3f4a3ca52ecc1d6b82f3fad1352b (patch)
treec7cc1c36872fa6e185acd78ec9545ee14b865c17 /drivers/w1/w1.h
parent526be41625a8b2282d5720dcb19f927edbf193b4 (diff)
Revert "w1: introduce a slave mutex for serializing IO"
This reverts commit 59d4467be405316916a4087d5b02d99196eeef04. Turns out it was the wrong version, will apply the correct version after this. Reported-by: NeilBrown <neilb@suse.de> Cc: Evgeniy Polyakov <zbr@ioremap.net> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/w1/w1.h')
-rw-r--r--drivers/w1/w1.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/w1/w1.h b/drivers/w1/w1.h
index 8c8be380a98a..4d012ca3f32c 100644
--- a/drivers/w1/w1.h
+++ b/drivers/w1/w1.h
@@ -75,7 +75,6 @@ struct w1_slave
void *family_data;
struct device dev;
struct completion released;
- struct mutex mutex;
};
typedef void (*w1_slave_found_callback)(struct w1_master *, u64);