diff --git a/[refs] b/[refs] index 645a6acce95a..26c7a411bd08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7b4e5506d1608112a208bc5391377d2c0b6dd80 +refs/heads/master: 45cf5eef4fa8bcd8d3aca3c2a0703d791c9ea56c diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 6783c2e5512d..f7fa24b96eaa 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -280,6 +280,7 @@ config ARCH_PXA bool "PXA2xx-based" depends on MMU select ARCH_MTD_XIP + select GENERIC_TIME help Support for Intel's PXA2XX processor line.