OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dc98b0c
ae4aee9
)
Merge branch 'imx/soc' into imx/dt
author
Shawn Guo
<shawn.guo@linaro.org>
Mon, 30 Mar 2015 08:37:04 +0000
(16:37 +0800)
committer
Shawn Guo
<shawn.guo@linaro.org>
Mon, 30 Mar 2015 08:37:04 +0000
(16:37 +0800)
1
2
arch/arm/mach-imx/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-imx/Kconfig
index
ddbb4b8
,
bf42a6a
..
93aa904
---
1
/
arch/arm/mach-imx/Kconfig
---
2
/
arch/arm/mach-imx/Kconfig
+++ b/
arch/arm/mach-imx/Kconfig
@@@
-585,9
-636,10
+587,10
@@@
config SOC_VF61
select ARM_GIC
select PINCTRL_VF610
select PL310_ERRATA_769419 if CACHE_L2X0
+ select SMP_ON_UP if SMP
help
- This enable support for Freescale Vybrid VF610 processor.
+ This enable
s
support for Freescale Vybrid VF610 processor.
choice
prompt "Clocksource for scheduler clock"