diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
| commit | fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch) | |
| tree | cba2597077cf33d122f8d771bf84618cc5374cf6 /drivers/net/cs89x0.h | |
| parent | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
| download | kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.zip kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.gz kernel_samsung_tuna-fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0.tar.bz2 | |
Merge branch 'upstream'
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 decea26..f19d1eb 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 |