]> err.no Git - linux-2.6/commitdiff
[PATCH] wrong ifdefs in 82596.c
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 1 Dec 2005 11:53:59 +0000 (06:53 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 29 Jan 2006 02:42:31 +0000 (21:42 -0500)
ifdefs around variable declaration would better match those around its uses...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/net/82596.c

index 13b745b39667710b33308b4c8f4d770758fec599..da0c878dcba8a4ee7b63255162834d340115f1cd 100644 (file)
@@ -614,7 +614,7 @@ static void rebuild_rx_bufs(struct net_device *dev)
 static int init_i596_mem(struct net_device *dev)
 {
        struct i596_private *lp = dev->priv;
-#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
+#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET) || defined(ENABLE_APRICOT)
        short ioaddr = dev->base_addr;
 #endif
        unsigned long flags;