diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 12:04:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 12:04:02 -0800 |
| commit | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (patch) | |
| tree | 34f0675602943161c3dc1340d6c8c449283b681c /drivers/net/ibm_emac/ibm_emac_mal.h | |
| parent | 537a95d9351f41cc3c24ddb2a646aedd6debb21b (diff) | |
| parent | f896424cbc61225e8f029fe23e5aae3e32103229 (diff) | |
| download | linux-next-70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab.tar.gz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/ibm_emac/ibm_emac_mal.h')
| -rw-r--r-- | drivers/net/ibm_emac/ibm_emac_mal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ibm_emac/ibm_emac_mal.h b/drivers/net/ibm_emac/ibm_emac_mal.h index 15b0bdae26ac..2a2d3b24b037 100644 --- a/drivers/net/ibm_emac/ibm_emac_mal.h +++ b/drivers/net/ibm_emac/ibm_emac_mal.h @@ -32,9 +32,10 @@ * reflect the fact that 40x and 44x have slightly different MALs. --ebs */ #if defined(CONFIG_405GP) || defined(CONFIG_405GPR) || defined(CONFIG_405EP) || \ - defined(CONFIG_440EP) || defined(CONFIG_NP405H) + defined(CONFIG_440EP) || defined(CONFIG_440GR) || defined(CONFIG_NP405H) #define MAL_VERSION 1 -#elif defined(CONFIG_440GP) || defined(CONFIG_440GX) || defined(CONFIG_440SP) +#elif defined(CONFIG_440GP) || defined(CONFIG_440GX) || defined(CONFIG_440SP) || \ + defined(CONFIG_440SPE) #define MAL_VERSION 2 #else #error "Unknown SoC, please check chip manual and choose MAL 'version'" |