summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5p64x0
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2012-01-06 16:08:09 +0900
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-06 11:19:24 -0800
commitea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e (patch)
tree4e350bc43cfc3ff28cbbd04ce01e360c4341299f /arch/arm/mach-s5p64x0
parenteea915bb0d1358755f151eaefb8208a2d5f3e10c (diff)
downloadlinux-3.10-ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e.tar.gz
linux-3.10-ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e.tar.bz2
linux-3.10-ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e.zip
arm: fix up some samsung merge sysdev conversion problems
Following should be fixed in your driver-core/driver-core-next. From: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r--arch/arm/mach-s5p64x0/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/cpu.c b/arch/arm/mach-s5p64x0/cpu.c
index 8b029901d91..74387a1bc76 100644
--- a/arch/arm/mach-s5p64x0/cpu.c
+++ b/arch/arm/mach-s5p64x0/cpu.c
@@ -195,7 +195,7 @@ struct bus_type s5p64x0_subsys = {
.dev_name = "s5p64x0-core",
};
-static struct device s5p64x0_subsys = {
+static struct device s5p64x0_dev = {
.bus = &s5p64x0_subsys,
};