diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:08:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:08:08 -0400 |
| commit | fffdedef691a0f6fa7ca1fc0a2a508cbb49def69 (patch) | |
| tree | 124b128308a4d35bab0ac8001da4b324d40220eb /drivers/net/tc35815.c | |
| parent | 5723ff931a94acf0738df42604ee89f852e151b0 (diff) | |
| parent | bf94e17bc8d35fc339945a42990a2f2b5e9b5a40 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
net/mac80211/rx.c: fix build error
acpi: Make ACPI_TOSHIBA depend on INPUT.
net/bfin_mac.c MDIO namespace fixes
jme: remove unused #include <version.h>
netfilter: remove unused #include <version.h>
net: Fix off-by-one in skb_dma_map
smc911x: Add support for LAN921{5,7,8} chips from SMSC
qlge: remove duplicated #include
wireless: remove duplicated #include
net/au1000_eth.c MDIO namespace fixes
net/tc35815.c: fix compilation
sky2: Fix WOL regression
r8169: NULL pointer dereference on r8169 load
Diffstat (limited to 'drivers/net/tc35815.c')
| -rw-r--r-- | drivers/net/tc35815.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c index 4980b12b6219..df20cafff7dd 100644 --- a/drivers/net/tc35815.c +++ b/drivers/net/tc35815.c | |||
| @@ -796,7 +796,7 @@ err_out_unregister_bus: | |||
| 796 | mdiobus_unregister(lp->mii_bus); | 796 | mdiobus_unregister(lp->mii_bus); |
| 797 | err_out_free_mdio_irq: | 797 | err_out_free_mdio_irq: |
| 798 | kfree(lp->mii_bus->irq); | 798 | kfree(lp->mii_bus->irq); |
| 799 | err_out_free_mii_bus; | 799 | err_out_free_mii_bus: |
| 800 | mdiobus_free(lp->mii_bus); | 800 | mdiobus_free(lp->mii_bus); |
| 801 | err_out: | 801 | err_out: |
| 802 | return err; | 802 | return err; |