diff options
| author | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-03-13 19:09:00 +0100 |
|---|---|---|
| committer | Krzysztof Hałasa <khc@pm.waw.pl> | 2009-03-17 15:01:22 +0100 |
| commit | 5ca328d24d25fa2c8d2aa33cb85116695be11070 (patch) | |
| tree | 301b0df131e4aff33a7401cda851daf5bade6586 /arch | |
| parent | 0a07232ff62d1523c5fa7292180890f4de670b95 (diff) | |
IXP4xx: add Ethernet and NPE support for IXP43x CPU.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx_npe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c index c73a94d0ca2..25231023490 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c @@ -575,8 +575,8 @@ int npe_load_firmware(struct npe *npe, const char *name, struct device *dev) for (i = 0; i < image->size; i++) image->data[i] = swab32(image->data[i]); - if (!cpu_is_ixp46x() && ((image->id >> 28) & 0xF /* device ID */)) { - print_npe(KERN_INFO, npe, "IXP46x firmware ignored on " + if (cpu_is_ixp42x() && ((image->id >> 28) & 0xF /* device ID */)) { + print_npe(KERN_INFO, npe, "IXP43x/IXP46x firmware ignored on " "IXP42x\n"); goto err; } @@ -596,7 +596,7 @@ int npe_load_firmware(struct npe *npe, const char *name, struct device *dev) "revision 0x%X:%X\n", (image->id >> 16) & 0xFF, (image->id >> 8) & 0xFF, image->id & 0xFF); - if (!cpu_is_ixp46x()) { + if (cpu_is_ixp42x()) { if (!npe->id) instr_size = NPE_A_42X_INSTR_SIZE; else |