aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-17 09:44:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-17 09:44:09 -0700
commit3aee0605a41399063c0ad396f1f4267108f210d3 (patch)
treec9e3ce738c3d093dbd861c5a53b63157edd893c2 /include/linux
parentf4c3f03838ae47a92f2d15d48ddf68deae5d7ebb (diff)
parent0396c215f301e92677d1e9a064b405e31501dc1d (diff)
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb: uwb: avoid radio controller reset loops uwb: stop uwbd thread if rc->start() fails uwb: handle radio controller events with out-of-range IDs correctly
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/uwb.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/uwb.h b/include/linux/uwb.h
index c02128991ff..7fc9746f22c 100644
--- a/include/linux/uwb.h
+++ b/include/linux/uwb.h
@@ -597,7 +597,7 @@ void uwb_rc_neh_grok(struct uwb_rc *, void *, size_t);
void uwb_rc_neh_error(struct uwb_rc *, int);
void uwb_rc_reset_all(struct uwb_rc *rc);
void uwb_rc_pre_reset(struct uwb_rc *rc);
-void uwb_rc_post_reset(struct uwb_rc *rc);
+int uwb_rc_post_reset(struct uwb_rc *rc);
/**
* uwb_rsv_is_owner - is the owner of this reservation the RC?