diff options
| author | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
|---|---|---|
| committer | Roland Dreier <roland@eddore.topspincom.com> | 2005-07-27 22:12:56 -0400 |
| commit | 2868bd281fef21d1e73d6b7648a41efc3d75f10c (patch) | |
| tree | 0ad821cfcc9e3f9e8b662d026bec6bb6d4ce69ac /drivers/net/ne.c | |
| parent | 6d376756f2cf3478d5a4fdb8d18e958948366b9d (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge /scratch/Ksrc/linux-git/
Diffstat (limited to 'drivers/net/ne.c')
| -rw-r--r-- | drivers/net/ne.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ne.c b/drivers/net/ne.c index 6c57096aa2e1..d209a1556b2e 100644 --- a/drivers/net/ne.c +++ b/drivers/net/ne.c | |||
| @@ -129,9 +129,9 @@ bad_clone_list[] __initdata = { | |||
| 129 | #define NESM_START_PG 0x40 /* First page of TX buffer */ | 129 | #define NESM_START_PG 0x40 /* First page of TX buffer */ |
| 130 | #define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ | 130 | #define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */ |
| 131 | 131 | ||
| 132 | #ifdef CONFIG_PLAT_MAPPI | 132 | #if defined(CONFIG_PLAT_MAPPI) |
| 133 | # define DCR_VAL 0x4b | 133 | # define DCR_VAL 0x4b |
| 134 | #elif CONFIG_PLAT_OAKS32R | 134 | #elif defined(CONFIG_PLAT_OAKS32R) |
| 135 | # define DCR_VAL 0x48 | 135 | # define DCR_VAL 0x48 |
| 136 | #else | 136 | #else |
| 137 | # define DCR_VAL 0x49 | 137 | # define DCR_VAL 0x49 |