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/phy/lxt.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/phy/lxt.c')
| -rw-r--r-- | drivers/net/phy/lxt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 29c39ff85de5..6f6e8b616a62 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c | |||
| @@ -223,7 +223,7 @@ static void __exit lxt_exit(void) | |||
| 223 | module_init(lxt_init); | 223 | module_init(lxt_init); |
| 224 | module_exit(lxt_exit); | 224 | module_exit(lxt_exit); |
| 225 | 225 | ||
| 226 | static struct mdio_device_id lxt_tbl[] = { | 226 | static struct mdio_device_id __maybe_unused lxt_tbl[] = { |
| 227 | { 0x78100000, 0xfffffff0 }, | 227 | { 0x78100000, 0xfffffff0 }, |
| 228 | { 0x001378e0, 0xfffffff0 }, | 228 | { 0x001378e0, 0xfffffff0 }, |
| 229 | { 0x00137a10, 0xfffffff0 }, | 229 | { 0x00137a10, 0xfffffff0 }, |