]> err.no Git - linux-2.6/commitdiff
[PATCH] net: remove CONFIG_NET_CBUS conditional for NS8390
authorArthur Othieno <apgo@patchbomb.org>
Tue, 28 Mar 2006 22:09:01 +0000 (14:09 -0800)
committerJeff Garzik <jeff@garzik.org>
Wed, 29 Mar 2006 22:34:02 +0000 (17:34 -0500)
Don't bother testing for CONFIG_NET_CBUS ("NEC PC-9800 C-bus cards"); it went
out with the rest of PC98 subarch.

Signed-off-by: Arthur Othieno <apgo@patchbomb.org>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/8390.h

index 599b68d8c45f9a190f53dd6a21adc3b98778867c..51e39dcd06030846dc885ea0a63fe4866161bbca 100644 (file)
@@ -134,7 +134,7 @@ struct ei_device {
 #define inb_p(_p)      inb(_p)
 #define outb_p(_v,_p)  outb(_v,_p)
 
-#elif defined(CONFIG_NET_CBUS) || defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
+#elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
 #define EI_SHIFT(x)    (ei_local->reg_offset[x])
 #else
 #define EI_SHIFT(x)    (x)