diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-11 17:21:51 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 17:22:09 (GMT) |
| commit | 28e783aacba4b27793ed8032925d90ae5e0dd7ac (patch) | |
| tree | f2de00a55f97eda33c58251c7f46a793ad691d85 /arch/arm/Kconfig | |
| parent | 5f48a29f1721736930b7817b430039c1d348dd05 (diff) | |
| parent | 4de3abb348d7a5bd6ddbfc26c34e0ee549874249 (diff) | |
| download | linux-28e783aacba4b27793ed8032925d90ae5e0dd7ac.tar.xz | |
Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/virt
From Will Deacon, this lays the foundation for a basic virtualzed machine type.
* 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
ARM: mach-virt: add SMP support using PSCI
ARM: Dummy Virtual Machine platform support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7a10661..441eda1 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1128,6 +1128,8 @@ source "arch/arm/mach-versatile/Kconfig" source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" +source "arch/arm/mach-virt/Kconfig" + source "arch/arm/mach-vt8500/Kconfig" source "arch/arm/mach-w90x900/Kconfig" |