[PATCH] #ifdef cleanups in drivers/net

Here's the last of them for 2.6.9-rc1 - two more #if/#ifdef cleanups.

Signed-off-by: <valdis.kletnieks@vt.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index ca57a7a5330f9d1cd15b594c208a1f084ebf6c34..91fa987dc8a868de846bfceb2691b4001b273d0d 100755 (executable)
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -719,7 +719,7 @@ static int amd8111e_tx(struct net_device *dev)
        return 0;
 }
 
-#if CONFIG_AMD8111E_NAPI 
+#ifdef CONFIG_AMD8111E_NAPI
 /* This function handles the driver receive operation in polling mode */
 static int amd8111e_rx_poll(struct net_device *dev, int * budget)
 {

diff --git a/drivers/net/via-velocity.h b/drivers/net/via-velocity.h
index b2c05a8a1aa3016f0856653d63d23d7d3fae85e8..1e88c9e358b103e7ea3f027020c4d647129bfb6a 100644 (file)
--- a/drivers/net/via-velocity.h
+++ b/drivers/net/via-velocity.h
@@ -1739,7 +1739,7 @@ struct velocity_info {
        struct net_device *dev;
        struct net_device_stats stats;
 
-#if CONFIG_PM
+#ifdef CONFIG_PM
        u32 pci_state[16];
 #endif