summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Othieno <apgo@patchbomb.org>2006-03-28 14:09:01 -0800
committerJeff Garzik <jeff@garzik.org>2006-03-29 17:34:02 -0500
commit8a91ed60f58451342a25f3ab4484c7257430aa8e (patch)
tree77ab8fe111aca353cd6b7e74db987d839ffd849b
parenta8b4cf42cf57e44e3c4a585e0f0a71e3a7efbf29 (diff)
downloadlinux-3.10-8a91ed60f58451342a25f3ab4484c7257430aa8e.tar.gz
linux-3.10-8a91ed60f58451342a25f3ab4484c7257430aa8e.tar.bz2
linux-3.10-8a91ed60f58451342a25f3ab4484c7257430aa8e.zip
[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>
-rw-r--r--drivers/net/8390.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 599b68d8c45..51e39dcd060 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)