diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:07:57 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 21:07:57 +0000 |
commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /arch/arm/mach-exynos/mach-origen.c | |
parent | 38abdcd0d0689aaca94e740ac67a952c7918caef (diff) | |
parent | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (diff) |
Merge branch 'samsung/exynos5' into next/soc2
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, |