diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/uwb/scan.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/uwb/scan.c')
| -rw-r--r-- | drivers/uwb/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/scan.c b/drivers/uwb/scan.c index 76a1a1ed7d3e..367aa12786b9 100644 --- a/drivers/uwb/scan.c +++ b/drivers/uwb/scan.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | /** | 42 | /** |
| 43 | * Start/stop scanning in a radio controller | 43 | * Start/stop scanning in a radio controller |
| 44 | * | 44 | * |
| 45 | * @rc: UWB Radio Controlller | 45 | * @rc: UWB Radio Controller |
| 46 | * @channel: Channel to scan; encodings in WUSB1.0[Table 5.12] | 46 | * @channel: Channel to scan; encodings in WUSB1.0[Table 5.12] |
| 47 | * @type: Type of scanning to do. | 47 | * @type: Type of scanning to do. |
| 48 | * @bpst_offset: value at which to start scanning (if type == | 48 | * @bpst_offset: value at which to start scanning (if type == |