diff options
author | John Stultz <john.stultz@linaro.org> | 2013-11-04 14:47:14 -0800 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-11-04 14:47:14 -0800 |
commit | 15c3debfd37238963933f57ac571c506a276caf1 (patch) | |
tree | 7c04daf43d55ef8c5141f706d7bc7b8e8a5fa386 | |
parent | 891396bcff01820175414078f9d1a4d50f00ea2e (diff) | |
parent | b38c6f06915c69424abb85fbd5c16e418865ed9b (diff) |
Merge branch 'linaro-fixes/android-3.10' into linaro-android-3.12-mergetracking-linaro-android-3.12-llct-20131112.0tracking-linaro-android-3.12-llct-20131105.0
-rw-r--r-- | drivers/switch/switch_class.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/switch/switch_class.c b/drivers/switch/switch_class.c index e05fc2591147..e373b625806e 100644 --- a/drivers/switch/switch_class.c +++ b/drivers/switch/switch_class.c @@ -54,8 +54,8 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, return sprintf(buf, "%s\n", sdev->name); } -static DEVICE_ATTR(state, S_IRUGO | S_IWUSR, state_show, NULL); -static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, name_show, NULL); +static DEVICE_ATTR(state, S_IRUGO, state_show, NULL); +static DEVICE_ATTR(name, S_IRUGO, name_show, NULL); void switch_set_state(struct switch_dev *sdev, int state) { |