summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ux500/board-mop500-regulators.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
committerTakashi Iwai <tiwai@suse.de>2011-04-09 10:05:30 +0200
commit664cee46e755b37204f1731cb8726db610f3486d (patch)
tree11ed0d43eff14123534785cf25c0a2143e134e7e /arch/arm/mach-ux500/board-mop500-regulators.h
parenta0334c50bf0ba7c720ed00f931e721c989efd233 (diff)
parent4e29402fe4b2006c994eed5020c42b2cc87d9b42 (diff)
downloadop-kernel-dev-664cee46e755b37204f1731cb8726db610f3486d.zip
op-kernel-dev-664cee46e755b37204f1731cb8726db610f3486d.tar.gz
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-regulators.h')
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.h b/arch/arm/mach-ux500/board-mop500-regulators.h
index 2675fae..9499215 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.h
+++ b/arch/arm/mach-ux500/board-mop500-regulators.h
@@ -14,6 +14,9 @@
#include <linux/regulator/machine.h>
#include <linux/regulator/ab8500.h>
+extern struct ab8500_regulator_reg_init
+ab8500_regulator_reg_init[AB8500_NUM_REGULATOR_REGISTERS];
extern struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS];
+extern struct regulator_init_data tps61052_regulator;
#endif
OpenPOWER on IntegriCloud