diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:12:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-06 21:12:59 +0200 |
| commit | c7b0807b9d4faddd87a75a5acb079e5dbfedd211 (patch) | |
| tree | 2d5978467086607efa0e5233c493c77ecffd9ea8 | |
| parent | fdc0867884ec0fc78091e28efa1d439affb5eb20 (diff) | |
| parent | 3e62af821050668a0c8915121838569ae59359be (diff) | |
| download | talos-op-linux-c7b0807b9d4faddd87a75a5acb079e5dbfedd211.tar.gz talos-op-linux-c7b0807b9d4faddd87a75a5acb079e5dbfedd211.zip | |
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: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/avic.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c9ad2b6a4505..5de82094096a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -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 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index eff4db5de0dd..935f8434c05b 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -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. diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c index f3d671ff7f1b..cbd55c36def3 100644 --- a/arch/arm/plat-mxc/avic.c +++ b/arch/arm/plat-mxc/avic.c @@ -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" |
