diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2011-10-10 14:48:27 +1200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2011-10-10 14:48:27 +1200 |
| commit | bbf5e9743fd6c9b4ef8a34db8a9502baf4191524 (patch) | |
| tree | f84832df4429178ba9da41b2876d7ae4840f62ea /arch/arm/mach-ux500/Kconfig | |
| parent | ARM: tegra: fix compilation error due to mach/hardware.h removal (diff) | |
| parent | Merge branch 'omap/fixes-for-3.1' into fixes (diff) | |
| download | linux-bbf5e9743fd6c9b4ef8a34db8a9502baf4191524.tar.gz linux-bbf5e9743fd6c9b4ef8a34db8a9502baf4191524.tar.bz2 linux-bbf5e9743fd6c9b4ef8a34db8a9502baf4191524.zip | |
Merge branch 'fixes' of git://git.linaro.org/people/arnd/arm-soc
* 'fixes' of git://git.linaro.org/people/arnd/arm-soc:
ARM: mach-ux500: enable fix for ARM errata 754322
ARM: OMAP: musb: Remove a redundant omap4430_phy_init call in usb_musb_init
ARM: OMAP: Fix i2c init for twl4030
ARM: OMAP4: MMC: fix power and audio issue, decouple USBC1 from MMC1
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index 4210cb434dbc..a3e0c8692f0d 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -6,6 +6,7 @@ config UX500_SOC_COMMON select ARM_GIC select HAS_MTU select ARM_ERRATA_753970 + select ARM_ERRATA_754322 menu "Ux500 SoC" |