diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:36:26 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 24cbb81f258b017de58ba488d6a6ecf9069aef7e (patch) | |
| tree | 8713ab682b667f6180e43b19dbb23b73242739f2 /arch/arm/mach-ux500/Kconfig | |
| parent | 78795d7a2a52afca3e80ecb94ca4022ce2364bf6 (diff) | |
mach-ux500: Fix merge problems and changes for 3.0
Must be cleaned!!
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/Kconfig')
| -rw-r--r-- | arch/arm/mach-ux500/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig index de604dbe54f..2117ceab151 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -4,7 +4,7 @@ config UX500_SOC_COMMON bool default y select ARM_GIC - select HAS_MTU + #EROBEMAselect HAS_MTU select NOMADIK_GPIO select ARM_ERRATA_753970 select SYS_SOC |