summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-03 00:04:24 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-03 00:19:31 -0800
commit55c8eb6c8eaa5009eed1557b296da5d4ea9c369a (patch)
tree1bdd736112e6ace457a447e1dc43f33188f1eb83 /drivers
parent0856f93958c488f0cc656be53c26dfd20663bdb3 (diff)
downloadlinux-3.10-55c8eb6c8eaa5009eed1557b296da5d4ea9c369a.tar.gz
linux-3.10-55c8eb6c8eaa5009eed1557b296da5d4ea9c369a.tar.bz2
linux-3.10-55c8eb6c8eaa5009eed1557b296da5d4ea9c369a.zip
SMC91x: Fix compilation on some platforms.
This reverts 51ac3beffd4afaea4350526cf01fe74aaff25eff ('SMC91x: delete unused local variable "lp"') and adds __maybe_unused markers to these (potentially) unused variables. The issue is that in some configurations SMC_IO_SHIFT evaluates to '(lp->io_shift)', but in some others it's plain '0'. Based upon a build failure report from Manuel Lauss. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/smc91x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 6f9895d4e5b..fc80f250da3 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -2060,6 +2060,7 @@ 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 __maybe_unused = netdev_priv(ndev);
if (!res)
return 0;
@@ -2074,6 +2075,7 @@ 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 __maybe_unused = netdev_priv(ndev);
if (res)
release_mem_region(res->start, ATTRIB_SIZE);