diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-21 01:14:59 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-21 01:14:59 -0500 |
commit | 5ffd785402c295328d3866d9f8630152f51d332a (patch) | |
tree | 1ecf19ebd7e92b5a99ce094934c0a7901c96402b /arch/arm/Kconfig | |
parent | 8ac49e0485bb79223a111b366a3b1f5ec9148729 (diff) | |
parent | 1b106699647b56313bac707e12e7ad67180cb147 (diff) |
Merge tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux into next/soc
From Maxime Ripard:
Allwinner SoC support for 3.8
* tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux:
ARM: sunxi: Add entry to MAINTAINERS
ARM: sunxi: Add device tree for the A13 and the Olinuxino board
ARM: sunxi: Add earlyprintk support
ARM: sunxi: Add basic support for Allwinner A1x SoCs
irqchip: sunxi: Add irq controller driver
clocksource: sunxi: Add Allwinner A1X Timer Driver
clk: sunxi: Add dummy fixed rate clock for Allwinner A1X SoCs
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 c1cc4f79e4fe..6c1d0198553d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1102,6 +1102,8 @@ source "arch/arm/mach-exynos/Kconfig" | |||
1102 | 1102 | ||
1103 | source "arch/arm/mach-shmobile/Kconfig" | 1103 | source "arch/arm/mach-shmobile/Kconfig" |
1104 | 1104 | ||
1105 | source "arch/arm/mach-sunxi/Kconfig" | ||
1106 | |||
1105 | source "arch/arm/mach-prima2/Kconfig" | 1107 | source "arch/arm/mach-prima2/Kconfig" |
1106 | 1108 | ||
1107 | source "arch/arm/mach-tegra/Kconfig" | 1109 | source "arch/arm/mach-tegra/Kconfig" |