From: Arthur Othieno <apgo@patchbomb.org>
Date: Tue, 28 Mar 2006 22:09:01 +0000 (-0800)
Subject: [PATCH] net: remove CONFIG_NET_CBUS conditional for NS8390
X-Git-Tag: v2.6.17-rc1~154
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a91ed60f58451342a25f3ab4484c7257430aa8e;p=linux-2.6

[PATCH] net: remove CONFIG_NET_CBUS conditional for NS8390

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>
---

diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 599b68d8c4..51e39dcd06 100644
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -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)