diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-24 13:17:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 13:17:06 -0800 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /drivers/staging/winbond/phy_calibration.h | |
| parent | net: arp_ioctl() must hold RTNL (diff) | |
| parent | fix a shutdown regression in intel_idle (diff) | |
| download | linux-dev-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.tar.xz linux-dev-e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/staging/winbond/phy_calibration.h')
| -rw-r--r-- | drivers/staging/winbond/phy_calibration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/winbond/phy_calibration.h b/drivers/staging/winbond/phy_calibration.h index 303203148839..84f6e840a47a 100644 --- a/drivers/staging/winbond/phy_calibration.h +++ b/drivers/staging/winbond/phy_calibration.h @@ -1,7 +1,7 @@ #ifndef __WINBOND_PHY_CALIBRATION_H #define __WINBOND_PHY_CALIBRATION_H -#include "wbhal_f.h" +#include "wbhal.h" #define REG_AGC_CTRL1 0x1000 #define REG_AGC_CTRL2 0x1004 |