diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
| commit | 930352862e9533fecc42c7ed20798a7c9e3aa874 (patch) | |
| tree | f234d6eb69c077f898e375aef30c9550dcf069d7 /drivers/uwb/uwb-internal.h | |
| parent | b46882b6eb713245916100ac5b58664cd242a08d (diff) | |
| parent | 7bbd03e0143b562ff7d96f7e71c016104020b550 (diff) | |
| download | linux-930352862e9533fecc42c7ed20798a7c9e3aa874.tar.xz | |
Merge branch 'topic/enum-info-cleanup' into for-next
this is a series of patches to just convert the plain info callback
for enum ctl elements to snd_ctl_elem_info(). Also, it includes the
extension of snd_ctl_elem_info(), for catching the unexpected string
cut-off and handling the zero items.
Diffstat (limited to 'drivers/uwb/uwb-internal.h')
| -rw-r--r-- | drivers/uwb/uwb-internal.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/uwb/uwb-internal.h b/drivers/uwb/uwb-internal.h index 9a103b100f1e..353c0555a1f5 100644 --- a/drivers/uwb/uwb-internal.h +++ b/drivers/uwb/uwb-internal.h @@ -172,7 +172,8 @@ struct uwb_rsv_alloc_info { int interval; }; -int uwb_rsv_find_best_allocation(struct uwb_rsv *rsv, struct uwb_mas_bm *available, +int uwb_rsv_find_best_allocation(struct uwb_rsv *rsv, + struct uwb_mas_bm *available, struct uwb_mas_bm *result); void uwb_rsv_handle_drp_avail_change(struct uwb_rc *rc); /* @@ -313,6 +314,7 @@ int uwb_radio_force_channel(struct uwb_rc *rc, int channel); /* -- UWB Sysfs representation */ extern struct class uwb_rc_class; +extern struct bus_type uwb_bus_type; extern struct device_attribute dev_attr_mac_address; extern struct device_attribute dev_attr_beacon; extern struct device_attribute dev_attr_scan; |