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/supern_2.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/supern_2.h')
| -rw-r--r-- | drivers/net/skfp/h/supern_2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/skfp/h/supern_2.h index 5ba0b8306753..0b73690280f6 100644 --- a/drivers/net/skfp/h/supern_2.h +++ b/drivers/net/skfp/h/supern_2.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | /* | 15 | /* |
| 16 | defines for AMD Supernet II chip set | 16 | defines for AMD Supernet II chip set |
| 17 | the chips are refered to as | 17 | the chips are referred to as |
| 18 | FPLUS Formac Plus | 18 | FPLUS Formac Plus |
| 19 | PLC Physical Layer | 19 | PLC Physical Layer |
| 20 | 20 | ||
| @@ -386,7 +386,7 @@ struct tx_queue { | |||
| 386 | #define FM_MDISRCV (4<<8) /* disable receive function */ | 386 | #define FM_MDISRCV (4<<8) /* disable receive function */ |
| 387 | #define FM_MRES0 (5<<8) /* reserve */ | 387 | #define FM_MRES0 (5<<8) /* reserve */ |
| 388 | #define FM_MLIMPROM (6<<8) /* limited-promiscuous mode */ | 388 | #define FM_MLIMPROM (6<<8) /* limited-promiscuous mode */ |
| 389 | #define FM_MPROMISCOUS (7<<8) /* address detection : promiscous */ | 389 | #define FM_MPROMISCOUS (7<<8) /* address detection : promiscuous */ |
| 390 | 390 | ||
| 391 | #define FM_SELSA 0x0800 /* select-short-address bit */ | 391 | #define FM_SELSA 0x0800 /* select-short-address bit */ |
| 392 | 392 | ||