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/tsi108_eth.c | |
| 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/tsi108_eth.c')
| -rw-r--r-- | drivers/net/tsi108_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index a03730bd1da5..5c633a32eaeb 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c | |||
| @@ -219,7 +219,7 @@ static int tsi108_read_mii(struct tsi108_prv_data *data, int reg) | |||
| 219 | if (i == 100) | 219 | if (i == 100) |
| 220 | return 0xffff; | 220 | return 0xffff; |
| 221 | else | 221 | else |
| 222 | return (TSI_READ_PHY(TSI108_MAC_MII_DATAIN)); | 222 | return TSI_READ_PHY(TSI108_MAC_MII_DATAIN); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | static void tsi108_write_mii(struct tsi108_prv_data *data, | 225 | static void tsi108_write_mii(struct tsi108_prv_data *data, |