summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2012-07-06 09:47:20 +0200
committerShawn Guo <shawn.guo@linaro.org>2012-07-06 09:54:11 +0200
commit3e62af821050668a0c8915121838569ae59359be (patch)
treecf291c24c87eebed7cf6a20525f725361748c36d
parentARM: imx: Fix build error due to missing irqs.h include (diff)
downloadlinux-3e62af821050668a0c8915121838569ae59359be.tar.xz
linux-3e62af821050668a0c8915121838569ae59359be.zip
ARM: imx: select USE_OF
Commit 544496a (ARM: imx: move irq_domain_add_legacy call into avic driver) introduced unconditional calls to irq_find_mapping and irq_domain_add_legacy, but it's still possible to have a .config without CONFIG_IRQ_DOMAIN=y resulting in CC arch/arm/plat-mxc/avic.o arch/arm/plat-mxc/avic.c: In function 'avic_handle_irq': arch/arm/plat-mxc/avic.c:172: error: implicit declaration of function 'irq_find_mapping' arch/arm/plat-mxc/avic.c: In function 'mxc_init_irq': arch/arm/plat-mxc/avic.c:207: error: implicit declaration of function 'irq_domain_add_legacy' arch/arm/plat-mxc/avic.c:208: error: 'irq_domain_simple_ops' undeclared (first use in this function) arch/arm/plat-mxc/avic.c:208: error: (Each undeclared identifier is reported only once arch/arm/plat-mxc/avic.c:208: error: for each function it appears in.) arch/arm/plat-mxc/avic.c:208: warning: assignment makes pointer from integer without a cast make[3]: *** [arch/arm/plat-mxc/avic.o] Error 1 make[2]: *** [arch/arm/plat-mxc/avic.o] Error 2 make[1]: *** [sub-make] Error 2 make: *** [all] Error 2 While selecting CONFIG_IRQ_DOMAIN would be enough, USE_OF is the future and implies CONFIG_IRQ_DOMAIN. So select USE_OF for ARCH_MXC and drop other explicit selects that are superflous now. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-imx/Kconfig4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 63f40b43b062..7815750f3572 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -447,6 +447,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 0021f726b153..7793c634601c 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
@@ -662,7 +661,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
@@ -758,7 +756,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
@@ -831,7 +828,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.