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/net/skfp/h/smt.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 'drivers/net/skfp/h/smt.h')
| -rw-r--r-- | drivers/net/skfp/h/smt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/skfp/h/smt.h index 2976757a36fb..2030f9cbb24b 100644 --- a/drivers/net/skfp/h/smt.h +++ b/drivers/net/skfp/h/smt.h | |||
| @@ -793,7 +793,7 @@ struct smt_rdf { | |||
| 793 | } ; | 793 | } ; |
| 794 | 794 | ||
| 795 | /* | 795 | /* |
| 796 | * SBA Request Allocation Responce Frame | 796 | * SBA Request Allocation Response Frame |
| 797 | */ | 797 | */ |
| 798 | struct smt_sba_alc_res { | 798 | struct smt_sba_alc_res { |
| 799 | struct smt_header smt ; /* generic header */ | 799 | struct smt_header smt ; /* generic header */ |