diff --git a/[refs] b/[refs] index 8bcfd8ffab62..e1e3c8b2e1b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c43ed5600b285e7b3bfe868ffe2eb259939c4b98 +refs/heads/master: 5485c1e090e7057517f180c7be1ab328df4bf949 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 5ebc5d922ea1..6c7eb9c080fd 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -830,6 +830,7 @@ config ARCH_U300 select HAVE_SCHED_CLOCK select HAVE_TCM select ARM_AMBA + select ARM_PATCH_PHYS_VIRT select ARM_VIC select GENERIC_CLOCKEVENTS select CLKDEV_LOOKUP