diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-31 22:08:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-31 22:08:11 -0700 |
| commit | b0d2804789bfe259841365e152c1234bd5642dc6 (patch) | |
| tree | 0fe5db27a3cb1ffb65862ce19b654b46376bd818 /arch/arm/mach-vt8500 | |
| parent | b891e30e55c4d47d6b3c4de1b4f89e7683104c93 (diff) | |
| parent | 442f15083eb25229fb95820bced8bea70298a34b (diff) | |
Merge tag 'arm-soc-cleanups-for-3.11' of git://github.com/mripard/linux into next/cleanup
From Maxime Ripard:
Cleanups in various machine definitions
- Patches to remove the .init_irq definition when using irqchip_init
- Make the ARM core code call debug_ll_io_init when no map_io callback is
declared
- Remove the .map_io definition in the various machines using it
(Some of these go through the platform maintainers, these are the ones who got
explicitly acked and not picked up by anyone else)
Signed-off-by: Olof Johansson <olof@lixom.net>
* tag 'arm-soc-cleanups-for-3.11' of git://github.com/mripard/linux:
ARM: sunxi: Remove the .map_io function declaration
ARM: mxs: remove the .map_io declaration
ARM: highbank: remove the .map_io declaration
ARM: mmu: Call debug_ll_io_init if no map_io function is specified
ARM: vt8500: Remove init_irq declaration in machine description
ARM: virt: Remove init_irq declaration in machine description
ARM: vexpress: Remove init_irq declaration in machine description
ARM: sirf: Remove init_irq declaration in machine description
ARM: spear: Remove init_irq declaration in machine description
ARM: nomadik: Remove init_irq declaration in machine description
Diffstat (limited to 'arch/arm/mach-vt8500')
| -rw-r--r-- | arch/arm/mach-vt8500/vt8500.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c index f5c33df7a59..f8f2f00856e 100644 --- a/arch/arm/mach-vt8500/vt8500.c +++ b/arch/arm/mach-vt8500/vt8500.c @@ -20,7 +20,6 @@ #include <linux/clocksource.h> #include <linux/io.h> -#include <linux/irqchip.h> #include <linux/pm.h> #include <asm/mach-types.h> @@ -179,7 +178,6 @@ static const char * const vt8500_dt_compat[] = { DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)") .dt_compat = vt8500_dt_compat, .map_io = vt8500_map_io, - .init_irq = irqchip_init, .init_machine = vt8500_init, .init_time = clocksource_of_init, .restart = vt8500_restart, |