summaryrefslogtreecommitdiff
path: root/drivers/net/cs89x0.h
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@tm8103>2005-11-07 11:02:51 +0100
committerJaroslav Kysela <perex@tm8103>2005-11-07 11:02:51 +0100
commit1d4ae4a119e5ba711f12b05cdf27f794460add4b (patch)
tree13a196ce55115d8f64acf0db86314f5abc847b40 /drivers/net/cs89x0.h
parentc2f2f0fa3829a8da1e029346c4f7e8da82f95d62 (diff)
parent0b154bb7d0cce80e9c0bcf11d4f9e71b59409d26 (diff)
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/cs89x0.h')
-rw-r--r--drivers/net/cs89x0.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h
index f19d1ebe0183..decea264f121 100644
--- a/drivers/net/cs89x0.h
+++ b/drivers/net/cs89x0.h
@@ -16,7 +16,7 @@
#include <linux/config.h>
-#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105) || defined (CONFIG_MACH_MP1000)
+#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105)
/* IXDP2401/IXDP2801 uses dword-aligned register addressing */
#define CS89x0_PORT(reg) ((reg) * 2)
#else