diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 21:00:04 +0000 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-30 21:00:04 +0000 |
commit | 07b188ab773e183871e57b33ae37bf635c9f12ba (patch) | |
tree | 311df8a0dd12fb7bd3e9b5b1a5ca500f0428d679 /drivers/net/cs89x0.h | |
parent | 47c564e10f219f867bdb49225972749a43485a47 (diff) | |
parent | 9f75e1eff3edb2bb07349b94c28f4f2a6c66ca43 (diff) | |
download | kernel-crypto-07b188ab773e183871e57b33ae37bf635c9f12ba.tar.gz kernel-crypto-07b188ab773e183871e57b33ae37bf635c9f12ba.tar.xz kernel-crypto-07b188ab773e183871e57b33ae37bf635c9f12ba.zip |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/net/cs89x0.h')
-rw-r--r-- | drivers/net/cs89x0.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cs89x0.h b/drivers/net/cs89x0.h index decea264f12..f19d1ebe018 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) +#if defined(CONFIG_ARCH_IXDP2X01) || defined(CONFIG_ARCH_PNX0105) || defined (CONFIG_MACH_MP1000) /* IXDP2401/IXDP2801 uses dword-aligned register addressing */ #define CS89x0_PORT(reg) ((reg) * 2) #else |