summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include/plat/cpu.h
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-12-29 22:20:30 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-12-29 22:21:47 -0700
commitd392da5207352f09030e95d9ea335a4225667ec0 (patch)
tree7d6cd1932afcad0a5619a5c504a6d93ca318187c /arch/arm/plat-samsung/include/plat/cpu.h
parente39d5ef678045d61812c1401f04fe8edb14d6359 (diff)
parent387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff)
downloadop-kernel-dev-d392da5207352f09030e95d9ea335a4225667ec0.zip
op-kernel-dev-d392da5207352f09030e95d9ea335a4225667ec0.tar.gz
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/cpu.h')
-rw-r--r--arch/arm/plat-samsung/include/plat/cpu.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h
index 6412933..9addb3d 100644
--- a/arch/arm/plat-samsung/include/plat/cpu.h
+++ b/arch/arm/plat-samsung/include/plat/cpu.h
@@ -79,7 +79,7 @@ extern struct sysdev_class s3c2442_sysclass;
extern struct sysdev_class s3c2443_sysclass;
extern struct sysdev_class s3c6410_sysclass;
extern struct sysdev_class s3c64xx_sysclass;
-extern struct sysdev_class s5p6440_sysclass;
+extern struct sysdev_class s5p64x0_sysclass;
extern struct sysdev_class s5p6442_sysclass;
extern struct sysdev_class s5pv210_sysclass;
OpenPOWER on IntegriCloud