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/smsc.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/smsc.c')
| -rw-r--r-- | drivers/net/phy/smsc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 78fa988256fc..342505c976d6 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c | |||
| @@ -254,7 +254,7 @@ MODULE_LICENSE("GPL"); | |||
| 254 | module_init(smsc_init); | 254 | module_init(smsc_init); |
| 255 | module_exit(smsc_exit); | 255 | module_exit(smsc_exit); |
| 256 | 256 | ||
| 257 | static struct mdio_device_id smsc_tbl[] = { | 257 | static struct mdio_device_id __maybe_unused smsc_tbl[] = { |
| 258 | { 0x0007c0a0, 0xfffffff0 }, | 258 | { 0x0007c0a0, 0xfffffff0 }, |
| 259 | { 0x0007c0b0, 0xfffffff0 }, | 259 | { 0x0007c0b0, 0xfffffff0 }, |
| 260 | { 0x0007c0c0, 0xfffffff0 }, | 260 | { 0x0007c0c0, 0xfffffff0 }, |