aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/frontier
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-12-07 10:47:56 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-07 10:47:56 -0800
commitea3398a1ae54cd3403f3cc0f6aa498c7452c681a (patch)
tree19903cfd3eb11f6cdd84f3b6923e604028178150 /drivers/staging/frontier
parent03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 (diff)
parentcf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff)
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv and winbond drivers properly. It also now allows us to fix up the sysfs attributes properly that were not in the .37 release due to them being only in this tree at the time. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/frontier')
-rw-r--r--drivers/staging/frontier/tranzport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/frontier/tranzport.c b/drivers/staging/frontier/tranzport.c
index a145a15cfdb3..8894ab14f167 100644
--- a/drivers/staging/frontier/tranzport.c
+++ b/drivers/staging/frontier/tranzport.c
@@ -204,7 +204,7 @@ static void usb_tranzport_abort_transfers(struct usb_tranzport *dev)
t->value = temp; \
return count; \
} \
- static DEVICE_ATTR(value, S_IWUGO | S_IRUGO, show_##value, set_##value);
+ static DEVICE_ATTR(value, S_IWUSR | S_IRUGO, show_##value, set_##value);
show_int(enable);
show_int(offline);

Privacy Policy