diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /drivers/net/fec.h | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/net/fec.h')
| -rw-r--r-- | drivers/net/fec.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/fec.h b/drivers/net/fec.h index c6e4f979ff5d..045761b8a600 100644 --- a/drivers/net/fec.h +++ b/drivers/net/fec.h | |||
| @@ -1,8 +1,9 @@ | |||
| 1 | /****************************************************************************/ | 1 | /****************************************************************************/ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * fec.h -- Fast Ethernet Controller for Motorola ColdFire 5270, | 4 | * fec.h -- Fast Ethernet Controller for Motorola ColdFire 5230, |
| 5 | 5271, 5272, 5274, 5275, 5280 and 5282. | 5 | * 5231, 5232, 5234, 5235, 5270, 5271, 5272, 5274, 5275, |
| 6 | * 5280 and 5282. | ||
| 6 | * | 7 | * |
| 7 | * (C) Copyright 2000-2003, Greg Ungerer (gerg@snapgear.com) | 8 | * (C) Copyright 2000-2003, Greg Ungerer (gerg@snapgear.com) |
| 8 | * (C) Copyright 2000-2001, Lineo (www.lineo.com) | 9 | * (C) Copyright 2000-2001, Lineo (www.lineo.com) |
| @@ -13,7 +14,7 @@ | |||
| 13 | #define FEC_H | 14 | #define FEC_H |
| 14 | /****************************************************************************/ | 15 | /****************************************************************************/ |
| 15 | 16 | ||
| 16 | #if defined(CONFIG_M527x) || defined(CONFIG_M528x) | 17 | #if defined(CONFIG_M523x) || defined(CONFIG_M527x) || defined(CONFIG_M528x) |
| 17 | /* | 18 | /* |
| 18 | * Just figures, Motorola would have to change the offsets for | 19 | * Just figures, Motorola would have to change the offsets for |
| 19 | * registers in the same peripheral device on different models | 20 | * registers in the same peripheral device on different models |
