From: Olof Johansson Date: Wed, 21 Nov 2012 06:14:59 +0000 (-0800) Subject: Merge tag 'tags/sunxi-support-for-3.8' of git://github.com/mripard/linux into next/soc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ffd785402c295328d3866d9f8630152f51d332a;p=linux-beck.git 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 --- 5ffd785402c295328d3866d9f8630152f51d332a diff --cc drivers/irqchip/Makefile index e2e6eb5d32f4,2444d07544cd..02bd37a6187f --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@@ -1,2 -1,2 +1,3 @@@ obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o + obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi.o +obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o