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/fec_mpc52xx.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 'drivers/net/fec_mpc52xx.h')
| -rw-r--r-- | drivers/net/fec_mpc52xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec_mpc52xx.h b/drivers/net/fec_mpc52xx.h index a227a525bdbb..41d2dffde55b 100644 --- a/drivers/net/fec_mpc52xx.h +++ b/drivers/net/fec_mpc52xx.h | |||
| @@ -289,6 +289,6 @@ struct mpc52xx_fec { | |||
| 289 | #define FEC_XMIT_FSM_ENABLE_CRC 0x01000000 | 289 | #define FEC_XMIT_FSM_ENABLE_CRC 0x01000000 |
| 290 | 290 | ||
| 291 | 291 | ||
| 292 | extern struct of_platform_driver mpc52xx_fec_mdio_driver; | 292 | extern struct platform_driver mpc52xx_fec_mdio_driver; |
| 293 | 293 | ||
| 294 | #endif /* __DRIVERS_NET_MPC52XX_FEC_H__ */ | 294 | #endif /* __DRIVERS_NET_MPC52XX_FEC_H__ */ |