Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 6d532e7..ba75e36 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1018,7 +1018,7 @@ config ARM_ERRATA_775420
        depends on CPU_V7
        help
         This option enables the workaround for the 775420 Cortex-A9 (r2p2,
-        r2p6,r2p8,r2p10,r3p0) erratum. In case a date cache maintenance
+        r2p6,r2p8,r2p10,r3p0) erratum. In case a data cache maintenance
         operation aborts with MMU exception, it might cause the processor
         to deadlock. This workaround puts DSB before executing ISB if
         an abort may occur on cache maintenance.
@@ -1357,7 +1357,7 @@ config ARCH_NR_GPIO
        int
        default 2048 if ARCH_SOCFPGA
        default 1024 if ARCH_BRCMSTB || ARCH_RENESAS || ARCH_TEGRA || \
-               ARCH_ZYNQ
+               ARCH_ZYNQ || ARCH_ASPEED
        default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || \
                SOC_DRA7XX || ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210
        default 416 if ARCH_SUNXI