diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2015-03-30 04:37:21 -0400 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2015-03-30 04:37:21 -0400 |
| commit | c5455f708b968dc462a292ba99da0d17100461d8 (patch) | |
| tree | 77a771ac3206d7760b30510b74e359e55d094357 /arch | |
| parent | 40cb1981b387f70ae750da57c2310539f4b813c7 (diff) | |
| parent | 4a073175392df3aa84fabca5a1bde47f36677d69 (diff) | |
Merge remote-tracking branch 'jcooper/irqchip/vybrid' into imx/dt
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 93aa90413c12..3a3d3e9d7bfd 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig | |||
| @@ -584,6 +584,7 @@ config SOC_IMX6SX | |||
| 584 | 584 | ||
| 585 | config SOC_VF610 | 585 | config SOC_VF610 |
| 586 | bool "Vybrid Family VF610 support" | 586 | bool "Vybrid Family VF610 support" |
| 587 | select IRQ_DOMAIN_HIERARCHY | ||
| 587 | select ARM_GIC | 588 | select ARM_GIC |
| 588 | select PINCTRL_VF610 | 589 | select PINCTRL_VF610 |
| 589 | select PL310_ERRATA_769419 if CACHE_L2X0 | 590 | select PL310_ERRATA_769419 if CACHE_L2X0 |