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/niu.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/niu.h')
| -rw-r--r-- | drivers/net/niu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index a41fa8ebe05f..51e177e1860d 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
| @@ -3279,6 +3279,7 @@ struct niu { | |||
| 3279 | unsigned long xpcs_off; | 3279 | unsigned long xpcs_off; |
| 3280 | 3280 | ||
| 3281 | struct timer_list timer; | 3281 | struct timer_list timer; |
| 3282 | u64 orig_led_state; | ||
| 3282 | const struct niu_phy_ops *phy_ops; | 3283 | const struct niu_phy_ops *phy_ops; |
| 3283 | int phy_addr; | 3284 | int phy_addr; |
| 3284 | 3285 | ||