diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2009-11-23 12:34:58 -0500 |
| commit | 9b8b317d58084b9a44f6f33b355c4278d9f841fb (patch) | |
| tree | e0df89800bf4301c4017db3cdf04a2056ec1a852 /arch/arm/mach-mv78xx0/common.c | |
| parent | 78c210efdefe07131f91ed512a3308b15bb14e2f (diff) | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
Merge commit 'v2.6.32-rc8' into HEAD
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 1b22e4af8791..08465eb6a2c2 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) | |||
| 845 | } else if (dev == MV78100_DEV_ID) { | 845 | } else if (dev == MV78100_DEV_ID) { |
| 846 | if (rev == MV78100_REV_A0) | 846 | if (rev == MV78100_REV_A0) |
| 847 | return "MV78100-A0"; | 847 | return "MV78100-A0"; |
| 848 | else if (rev == MV78100_REV_A1) | ||
| 849 | return "MV78100-A1"; | ||
| 848 | else | 850 | else |
| 849 | return "MV78100-Rev-Unsupported"; | 851 | return "MV78100-Rev-Unsupported"; |
| 850 | } else if (dev == MV78200_DEV_ID) { | 852 | } else if (dev == MV78200_DEV_ID) { |