diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 19:16:42 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 19:16:42 +1100 |
| commit | 626ea4d3ac18adaa56e2b0e6539f0be92235adab (patch) | |
| tree | 6a7ae6eeec5bf8b2cbe42b02b41d325cb4adc6cf /drivers/staging/et131x/et1310_phy.c | |
| parent | 75bbbf41644458d3c007d7ffd60e987e8a6a91cd (diff) | |
| parent | de360f79ed4fac0964b13a116a96d2fa03f86db5 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/et131x/et1310_phy.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 6ecad619f779..4a55fbfbd59d 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -85,17 +85,14 @@ #include <linux/random.h> #include "et1310_phy.h" -#include "et1310_pm.h" -#include "et1310_jagcore.h" #include "et131x_adapter.h" -#include "et131x_netdev.h" -#include "et131x_initpci.h" #include "et1310_address_map.h" #include "et1310_tx.h" #include "et1310_rx.h" -#include "et1310_mac.h" + +#include "et131x.h" /* Prototypes for functions with local scope */ static void et131x_xcvr_init(struct et131x_adapter *etdev); |