diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:14:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 15:14:45 -0700 |
commit | bc5bbc4541c4098603edcf9b0b960a71741e79de (patch) | |
tree | 45a07588b6c610493366746f28ea848ca02bae12 /arch/arm/mach-ux500/board-mop500-regulators.h | |
parent | 32836e082b25f17e7b09f11335b34b039c7568d2 (diff) | |
parent | fe67dfc874da094bbbfbb73e74924d414b96105b (diff) |
Merge branch 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson
* 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
mach-ux500: configure board for the TPS61052 regulator v2
mach-ux500: provide ab8500 init vector
mach-ux500: board support for AB8500 GPIO driver
gpio: driver for 42 AB8500 GPIO pins
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500-regulators.h')
-rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.h b/arch/arm/mach-ux500/board-mop500-regulators.h index f979b892e4f..94992158d96 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.h +++ b/arch/arm/mach-ux500/board-mop500-regulators.h @@ -17,5 +17,6 @@ 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 |