summaryrefslogtreecommitdiff
path: root/drivers/net/cs89x0.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-11-05 15:44:48 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-11-05 15:44:48 -0500
commit18ce920a6eba05c0d55cdc95fbbadf7e4c4b457b (patch)
treec4a4a9a0455c00edf16689cf0252c82c52d518db /drivers/net/cs89x0.h
parentc4811b151b6584a668de8ae59eb71c4890b9ad94 (diff)
parent70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff)
Merge branch 'master'
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