diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 07:17:34 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 07:17:34 (GMT) |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /drivers/net/smc91x.c | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
| download | linux-a1744d3bee19d3b9cbfb825ab316a101b9c9f109.tar.xz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'drivers/net/smc91x.c')
| -rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 37ff94b..2d8bfa7 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -2059,7 +2059,6 @@ static int smc_request_attrib(struct platform_device *pdev, struct net_device *ndev) { struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib"); - struct smc_local *lp = netdev_priv(ndev); if (!res) return 0; @@ -2074,7 +2073,6 @@ static void smc_release_attrib(struct platform_device *pdev, struct net_device *ndev) { struct resource * res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "smc91x-attrib"); - struct smc_local *lp = netdev_priv(ndev); if (res) release_mem_region(res->start, ATTRIB_SIZE); |