Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7b0807b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/irq 

Two bug fixes for the previous state of the imx sparse irq changes.

* 'imx/sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6

:
  ARM: imx: select USE_OF
  ARM: imx: Fix build error due to missing irqs.h include

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents fdc08678 3e62af82

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -448,6 +448,7 @@ config ARCH_MXC 
	select GENERIC_IRQ_CHIP

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/mach-imx/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -380,7 +380,6 @@ config MACH_IMX27IPCAM 
config MACH_IMX27_DT

	bool "Support i.MX27 platforms from device tree"

	select SOC_IMX27

	select USE_OF

	help

	  Include support for Freescale i.MX27 based platforms

	  using the device tree for discovery
@@ -663,7 +662,6 @@ comment "i.MX51 machines:" 
config MACH_IMX51_DT

	bool "Support i.MX51 platforms from device tree"

	select SOC_IMX51

	select USE_OF

	select MACH_MX51_BABBAGE

	help

	  Include support for Freescale i.MX51 based platforms
@@ -759,7 +757,6 @@ comment "i.MX53 machines:" 
config MACH_IMX53_DT

	bool "Support i.MX53 platforms from device tree"

	select SOC_IMX53

	select USE_OF

	select MACH_MX53_ARD

	select MACH_MX53_EVK

	select MACH_MX53_LOCO
@@ -832,7 +829,6 @@ config SOC_IMX6Q 
	select HAVE_SMP

	select PINCTRL

	select PINCTRL_IMX6Q

	select USE_OF



	help

	  This enables support for Freescale i.MX6 Quad processor.

arch/arm/plat-mxc/avic.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/mach/irq.h>

#include <asm/exception.h>

#include <mach/hardware.h>

#include <mach/irqs.h>



#include "irq-common.h"