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/broadcom.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/broadcom.c')
| -rw-r--r-- | drivers/net/phy/broadcom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 4accd83d3dfe..d84c4224dd12 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c | |||
| @@ -930,7 +930,7 @@ static void __exit broadcom_exit(void) | |||
| 930 | module_init(broadcom_init); | 930 | module_init(broadcom_init); |
| 931 | module_exit(broadcom_exit); | 931 | module_exit(broadcom_exit); |
| 932 | 932 | ||
| 933 | static struct mdio_device_id broadcom_tbl[] = { | 933 | static struct mdio_device_id __maybe_unused broadcom_tbl[] = { |
| 934 | { PHY_ID_BCM5411, 0xfffffff0 }, | 934 | { PHY_ID_BCM5411, 0xfffffff0 }, |
| 935 | { PHY_ID_BCM5421, 0xfffffff0 }, | 935 | { PHY_ID_BCM5421, 0xfffffff0 }, |
| 936 | { PHY_ID_BCM5461, 0xfffffff0 }, | 936 | { PHY_ID_BCM5461, 0xfffffff0 }, |