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/linux/smsc911x.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/linux/smsc911x.h')
| -rw-r--r-- | include/linux/smsc911x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h index 7144e8aa1e41..4dde70e74822 100644 --- a/include/linux/smsc911x.h +++ b/include/linux/smsc911x.h | |||
| @@ -29,6 +29,7 @@ struct smsc911x_platform_config { | |||
| 29 | unsigned int irq_polarity; | 29 | unsigned int irq_polarity; |
| 30 | unsigned int irq_type; | 30 | unsigned int irq_type; |
| 31 | unsigned int flags; | 31 | unsigned int flags; |
| 32 | unsigned int shift; | ||
| 32 | phy_interface_t phy_interface; | 33 | phy_interface_t phy_interface; |
| 33 | unsigned char mac[6]; | 34 | unsigned char mac[6]; |
| 34 | }; | 35 | }; |