| commit | aab3a70e98a1492833c713fe095dbdccb3bc6262 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Sat Oct 08 22:21:07 2011 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Sat Oct 08 22:21:07 2011 +0200 |
| tree | 4cdd2e9a8293f1d86f72537487f8ebf50ddde11e | |
| parent | 98e87d57aab9b1594f9cc53a386fcb6f2f2ba6e2 [diff] | |
| parent | b8e111a74d281b70e88bd67fec48cfda4f9bdce2 [diff] |
Merge branch 'omap/fixes-for-3.1' into fixes
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 4210cb4..a3e0c86 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig
@@ -6,6 +6,7 @@ select ARM_GIC select HAS_MTU select ARM_ERRATA_753970 + select ARM_ERRATA_754322 menu "Ux500 SoC"