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 /include/net/wpan-phy.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/net/wpan-phy.h')
| -rw-r--r-- | include/net/wpan-phy.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h index 85926231c07a..d86fffd3c03c 100644 --- a/include/net/wpan-phy.h +++ b/include/net/wpan-phy.h | |||
| @@ -28,7 +28,7 @@ struct wpan_phy { | |||
| 28 | struct mutex pib_lock; | 28 | struct mutex pib_lock; |
| 29 | 29 | ||
| 30 | /* | 30 | /* |
| 31 | * This is a PIB acording to 802.15.4-2006. | 31 | * This is a PIB according to 802.15.4-2006. |
| 32 | * We do not provide timing-related variables, as they | 32 | * We do not provide timing-related variables, as they |
| 33 | * aren't used outside of driver | 33 | * aren't used outside of driver |
| 34 | */ | 34 | */ |