diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-04-25 19:23:57 +0100 |
| commit | ca8cdf043c7c6d8e1b4b3d86f3cae12fc37756a2 (patch) | |
| tree | dad605a1b3142e85d9ddc08a77d62f6bf09f22cc /arch/arm/plat-s3c/init.c | |
| parent | 16696dd08020690cff796fc4705b4d6bd14e91b0 (diff) | |
| parent | b4136a36f31a65d0998a328465df9e8e2ba93166 (diff) | |
Merge branch 'andy-tracking' into drm-tracking
Conflicts:
drivers/mfd/glamo/Kconfig
Diffstat (limited to 'arch/arm/plat-s3c/init.c')
| -rw-r--r-- | arch/arm/plat-s3c/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/init.c b/arch/arm/plat-s3c/init.c index 94a3120f561..c1ddac1007c 100644 --- a/arch/arm/plat-s3c/init.c +++ b/arch/arm/plat-s3c/init.c @@ -52,7 +52,8 @@ static void __init set_system_rev(unsigned int idcode) if (idcode == 0x32410002 || idcode == 0x32440001) system_rev |= (0x1 << 16); - if (idcode == 0x32440aaa) /* s3c2442 */ + if (idcode == 0x32440aaa /* s3c2442 */ + || idcode == 0x32440aab) /* s3c2442b */ system_rev |= (0x2 << 16); if (idcode == 0x0) /* s3c2400 */ system_rev |= (0x2400 << 16); |