projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
arm
/
mach-ux500
/
Kconfig
diff --git
a/arch/arm/mach-ux500/Kconfig
b/arch/arm/mach-ux500/Kconfig
index
0034d2c
..
8052bd5
100644
(file)
--- a/
arch/arm/mach-ux500/Kconfig
+++ b/
arch/arm/mach-ux500/Kconfig
@@
-11,13
+11,8
@@
config ARCH_U8500
select ARM_GIC
select CACHE_L2X0
select CLKSRC_NOMADIK_MTU
select ARM_GIC
select CACHE_L2X0
select CLKSRC_NOMADIK_MTU
- select COMMON_CLK
- select CPU_V7
- select GENERIC_CLOCKEVENTS
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
- select HAVE_SMP
- select MIGHT_HAVE_CACHE_L2X0
select PINCTRL
select PINCTRL_ABX500
select PINCTRL_NOMADIK
select PINCTRL
select PINCTRL_ABX500
select PINCTRL_NOMADIK
@@
-76,7
+71,6
@@
config UX500_AUTO_PLATFORM
config MACH_UX500_DT
bool "Generic U8500 support using device tree"
depends on MACH_MOP500
config MACH_UX500_DT
bool "Generic U8500 support using device tree"
depends on MACH_MOP500
- select USE_OF
endmenu
endmenu