[PATCH] (9/22) wrong ifdefs in 82596

From: Al Viro
Date: Thu Aug 25 2005 - 00:25:15 EST


ifdefs around variable declaration would better match those around its uses...

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
----
diff -urN RC13-rc7-lance/drivers/net/82596.c RC13-rc7-82596-apricot/drivers/net/82596.c
--- RC13-rc7-lance/drivers/net/82596.c 2005-08-10 10:37:49.000000000 -0400
+++ RC13-rc7-82596-apricot/drivers/net/82596.c 2005-08-25 00:54:10.000000000 -0400
@@ -614,7 +614,7 @@
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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/