diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/uwb/wlp/sysfs.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/uwb/wlp/sysfs.c')
| -rw-r--r-- | drivers/uwb/wlp/sysfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/uwb/wlp/sysfs.c b/drivers/uwb/wlp/sysfs.c index 0370399ff4bb..6627c94cc854 100644 --- a/drivers/uwb/wlp/sysfs.c +++ b/drivers/uwb/wlp/sysfs.c | |||
| @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr, | |||
| 615 | return ret; | 615 | return ret; |
| 616 | } | 616 | } |
| 617 | 617 | ||
| 618 | static | 618 | static const struct sysfs_ops wss_sysfs_ops = { |
| 619 | struct sysfs_ops wss_sysfs_ops = { | ||
| 620 | .show = wlp_wss_attr_show, | 619 | .show = wlp_wss_attr_show, |
| 621 | .store = wlp_wss_attr_store, | 620 | .store = wlp_wss_attr_store, |
| 622 | }; | 621 | }; |