diff options
| author |   Olof Johansson <olof@lixom.net> | 2012-09-04 22:38:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-13 00:16:45 -0700 |
| commit | f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee (patch) | |
| tree | e877c3aaa9a097eeb38d1c5ee0b839dec88f4812 /arch/arm/mach-ux500/Kconfig | |
| parent | Merge branch 'ofdeviceiddata' of git://git.pengutronix.de/git/ukl/linux into next/fixes-non-critical (diff) | |
| parent | ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT (diff) | |
| download | linux-dev-f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee.tar.xz linux-dev-f78a88d4976d1c8099d2afc4ceea14fa8b4bfaee.zip | |
Merge tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical
This is three ux500 core updates with no direct relation
but grouped in a pull request:
- Set the proper GIC flags to mask when suspended and
skip wake.
- Fix a build error introduced from the PMU patch set
- Provide a fixed regulator for the Snowball when not
using DT.
* tag 'ux500-core-updates' of http://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT
ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c
ARM: ux500: set proper GIC flags
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 53d3d46dec12..842c0a2d7481 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -28,6 +28,7 @@ config MACH_MOP500 select I2C select I2C_NOMADIK select SOC_BUS + select REGULATOR_FIXED_VOLTAGE help Include support for the MOP500 development platform. |