diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-19 20:52:33 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 10:07:48 +0000 |
commit | bde755679a3ba5af0d16231f8532e8373c5e2ecc (patch) | |
tree | 782fa01306ada3e084bd3c47ea1af378b97c0e16 /arch/arm/mach-exynos/mach-origen.c | |
parent | Merge branch 'renesas/soc' into next/soc (diff) | |
parent | ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver (diff) | |
download | linux-dev-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.xz linux-dev-bde755679a3ba5af0d16231f8532e8373c5e2ecc.zip |
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c
The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-exynos/mach-origen.c')
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 0679b8ad2d1e..3ec3ccf9f35c 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -412,7 +412,7 @@ static struct max8997_regulator_data __initdata origen_max8997_regulators[] = { { MAX8997_BUCK7, &max8997_buck7_data }, }; -struct max8997_platform_data __initdata origen_max8997_pdata = { +static struct max8997_platform_data __initdata origen_max8997_pdata = { .num_regulators = ARRAY_SIZE(origen_max8997_regulators), .regulators = origen_max8997_regulators, |