Merge branch 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel...
authorDan Murphy <dmurphy@ti.com>
Thu, 18 Apr 2013 13:40:58 +0000 (08:40 -0500)
committerDan Murphy <dmurphy@ti.com>
Thu, 18 Apr 2013 13:40:58 +0000 (08:40 -0500)
TI-Feature: platform_base
TI-Tree: git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree
TI-Branch: platform-base-3.8.y

* 'platform-base-3.8.y' of git://gitorious.ti.com/~rrnayak/ti-linux-kernel/platform-linux-feature-tree:
  ARM: OMAP5: Enable workaround for 798181
  arm: errata: Workaround for Cortex-A15 erratum 798181 (TLBI/DSB operations)

Signed-off-by: Dan Murphy <dmurphy@ti.com>
1  2 
arch/arm/Kconfig
arch/arm/mach-omap2/Kconfig

Simple merge
index 3ceda910e4b98ac1c369fed8c79c4e0d043b428f,f43ebf61df702ce51d4c09fb5a47324cdd15c9d9..2530169605d1d26b698cef9f9ed487057c6293ec
@@@ -87,9 -82,8 +87,10 @@@ config SOC_OMAP
        select CPU_V7
        select HAVE_SMP
        select COMMON_CLK
 +      select USB_ARCH_HAS_EHCI if USB_SUPPORT
 +      select USB_ARCH_HAS_XHCI if USB_SUPPORT
        select ARCH_NEEDS_CPU_IDLE_COUPLED
+       select ARM_ERRATA_798181
  
  comment "OMAP Core Type"
        depends on ARCH_OMAP2