diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-14 18:41:44 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-14 18:41:44 -0700 |
| commit | 75d39696d31fa8ef4a099a37d1b6b4e91c9a8775 (patch) | |
| tree | 5d27487cbbc8397785a00e82b4b25320257afd47 /arch | |
| parent | e45600107b6700237f22f2d1d853bd49d8168f68 (diff) | |
| parent | ec3805e6199649db2a462045a38eb1050c6151aa (diff) | |
| download | talos-op-linux-75d39696d31fa8ef4a099a37d1b6b4e91c9a8775.tar.gz talos-op-linux-75d39696d31fa8ef4a099a37d1b6b4e91c9a8775.zip | |
Merge tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux into next/cleanup
From Maxime Ripard:
Allwinner SoCs platform additions for 3.11
- Various cleanups and documentation updates
* tag 'sunxi-core-for-3.11' of git://github.com/mripard/linux:
ARM: sunxi: irqchip: Update the documentation
ARM: sunxi: Update datasheet documentation
ARM: sunxi: Remove init_irq declaration in machine description
Signed-off-by: Olof Johansson <olof@lixom.net>
#
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index d1b5bc537fbb..a3a755fa2850 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c @@ -14,7 +14,6 @@ #include <linux/delay.h> #include <linux/kernel.h> #include <linux/init.h> -#include <linux/irqchip.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> @@ -100,7 +99,6 @@ static const char * const sunxi_board_dt_compat[] = { DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)") .init_machine = sunxi_dt_init, - .init_irq = irqchip_init, .init_time = sunxi_timer_init, .dt_compat = sunxi_board_dt_compat, MACHINE_END |
