diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-18 02:51:52 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-18 02:51:52 +0300 |
| commit | 05d9881bc4c6f172997b7a59e4a1a95910c4ebd7 (patch) | |
| tree | be1f4df97a174489dc4b7c6bcfed2995751e38c7 /arch/arm/mach-ixp4xx/ixp4xx_npe.c | |
| parent | 3879f5d6f03b66626af014cbb6071ad4d79b1c42 (diff) | |
| parent | 7f3ccb5a22c945916390a9bd7101d0f553fa0fbd (diff) | |
| download | linux-05d9881bc4c6f172997b7a59e4a1a95910c4ebd7.tar.xz | |
Merge branch 'for-russell' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixp4xx_npe.c')
| -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 c73a94d0ca2b..252310234903 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 |