diff options
| author | Russell King <[email protected]> | 2008-10-15 23:16:07 +0100 |
|---|---|---|
| committer | Russell King <[email protected]> | 2008-10-15 23:16:07 +0100 |
| commit | 2502991560dc8244dbe10e48473d85722c1e2ec1 (patch) | |
| tree | 63b1f3be2ed56ff06f1e8db709e4ce85d69c3add /drivers/net/wireless/b43/tables_nphy.c | |
| parent | 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 (diff) | |
| parent | a9ff8f6462635c8d9f8d64b7b10ddcea8404d77b (diff) | |
Merge branch 'fixes' into for-linus
Conflicts:
arch/arm/mach-versatile/core.c
Diffstat (limited to 'drivers/net/wireless/b43/tables_nphy.c')
| -rw-r--r-- | drivers/net/wireless/b43/tables_nphy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/tables_nphy.c b/drivers/net/wireless/b43/tables_nphy.c index 2aa57551786a..4e2336315545 100644 --- a/drivers/net/wireless/b43/tables_nphy.c +++ b/drivers/net/wireless/b43/tables_nphy.c @@ -24,8 +24,8 @@ #include "b43.h" #include "tables_nphy.h" -#include "phy.h" -#include "nphy.h" +#include "phy_common.h" +#include "phy_n.h" struct b2055_inittab_entry { |