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/cmtdef.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/cmtdef.h')
| -rw-r--r-- | drivers/net/skfp/h/cmtdef.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/skfp/h/cmtdef.h index f2f771d8be76..5a6c6122ccb0 100644 --- a/drivers/net/skfp/h/cmtdef.h +++ b/drivers/net/skfp/h/cmtdef.h | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * implementation specific constants | 21 | * implementation specific constants |
| 22 | * MODIIFY THE FOLLWOING THREE DEFINES | 22 | * MODIIFY THE FOLLOWING THREE DEFINES |
| 23 | */ | 23 | */ |
| 24 | #define AMDPLC /* if Amd PLC chip used */ | 24 | #define AMDPLC /* if Amd PLC chip used */ |
| 25 | #ifdef CONC | 25 | #ifdef CONC |
| @@ -456,7 +456,7 @@ struct s_plc { | |||
| 456 | u_long soft_err ; /* error counter */ | 456 | u_long soft_err ; /* error counter */ |
| 457 | u_long parity_err ; /* error counter */ | 457 | u_long parity_err ; /* error counter */ |
| 458 | u_long ebuf_err ; /* error counter */ | 458 | u_long ebuf_err ; /* error counter */ |
| 459 | u_long ebuf_cont ; /* continous error counter */ | 459 | u_long ebuf_cont ; /* continuous error counter */ |
| 460 | u_long phyinv ; /* error counter */ | 460 | u_long phyinv ; /* error counter */ |
| 461 | u_long vsym_ctr ; /* error counter */ | 461 | u_long vsym_ctr ; /* error counter */ |
| 462 | u_long mini_ctr ; /* error counter */ | 462 | u_long mini_ctr ; /* error counter */ |