diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:32:42 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:32:42 -0800 |
| commit | 749f3cbe1acd60a7bf6ff0396a48a28705096305 (patch) | |
| tree | 12ef5dafe8da5e0e2186643318cd494e0c5e238c /arch/arm/mach-mv78xx0/common.c | |
| parent | 6b46362c0ea472b174c336786fd406c504326ad4 (diff) | |
| parent | 65f69e5c16f8eee17b7f71bfad9e8e58f44c7386 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
ARM: Use a definition for the userspace cmpxchg emulation syscall
[ARM] Fix test for unimplemented ARM syscalls
ARM: 5784/1: fix early boot machine ID mismatch error display
[ARM] orion5x: update defconfig
[ARM] Kirkwood: update defconfig
[ARM] Kirkwood: clarify PCIe MEM bus/physical address distinction
[ARM] kirkwood: fix PCI I/O port assignment
[ARM] kirkwood: fix section mismatch
[ARM] OpenRD base: Initialize PCI express and i2c
[ARM] properly report mv78100 stepping A1
ARM: 5780/1: KS8695: Fix macro definition bug in regs-switch.c
ARM: 5779/1: ep93xx/micro9.c: fix implicit declaration of function __raw_readl and IOMEM
RealView: Add sparsemem support for the RealView PBX platform
RealView: Remove duplicated #define REALVIEW_SYS_FLAGS* statements
RealView: Add default memory configuration
Check whether the SCU was already initialised
ARMv7: Check whether the SMP/nAMP mode was already enabled
[ARM] pxa: fix resume failure by saving/restoring IPRx registers
[ARM] pxa/palm: fix incorrect initialization of Palm Tungsten C keyboard
[ARM] pxa/zaurus: fix NAND flash OOB layout for Borzoi
Diffstat (limited to 'arch/arm/mach-mv78xx0/common.c')
| -rw-r--r-- | arch/arm/mach-mv78xx0/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index 1b22e4af879..08465eb6a2c 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c @@ -845,6 +845,8 @@ static char * __init mv78xx0_id(void) } else if (dev == MV78100_DEV_ID) { if (rev == MV78100_REV_A0) return "MV78100-A0"; + else if (rev == MV78100_REV_A1) + return "MV78100-A1"; else return "MV78100-Rev-Unsupported"; } else if (dev == MV78200_DEV_ID) { |