diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-26 18:26:03 +1100 |
| commit | 7dacf842dba1515f097f9efe889e497adfc258ce (patch) | |
| tree | b25b366e96e42f3049b162a266abe19a253c2da5 /drivers/staging/et131x/et1310_pm.c | |
| parent | 190e8cfcb9ac7ae9bbf6b7f54450292f365727dc (diff) | |
| parent | 78a22eafad6d9c3ce5400b3226a407ea784d7ed0 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
drivers/staging/sm7xx/smtc2d.c
drivers/staging/sm7xx/smtc2d.h
Diffstat (limited to 'drivers/staging/et131x/et1310_pm.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_pm.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c index 7d0772359291..41019e390af5 100644 --- a/drivers/staging/et131x/et1310_pm.c +++ b/drivers/staging/et131x/et1310_pm.c @@ -83,13 +83,9 @@ #include <linux/ioport.h> #include "et1310_phy.h" -#include "et1310_pm.h" -#include "et1310_jagcore.h" -#include "et1310_mac.h" #include "et1310_rx.h" - #include "et131x_adapter.h" -#include "et131x_initpci.h" +#include "et131x.h" /** * EnablePhyComa - called when network cable is unplugged |