projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm-dt-6.0' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[linux-2.6-microblaze.git]
/
arch
/
arm
/
mach-omap2
/
Kconfig
diff --git
a/arch/arm/mach-omap2/Kconfig
b/arch/arm/mach-omap2/Kconfig
index
f7f9402
..
3b53dda
100644
(file)
--- a/
arch/arm/mach-omap2/Kconfig
+++ b/
arch/arm/mach-omap2/Kconfig
@@
-123,7
+123,7
@@
config ARCH_OMAP2PLUS
config OMAP_INTERCONNECT_BARRIER
bool
select ARM_HEAVY_MB
-
+
config ARCH_OMAP
bool
@@
-243,10
+243,10
@@
config MACH_OMAP2_TUSB6010
default y if MACH_NOKIA_N8X0
config MACH_NOKIA_N810
- bool
+ bool
config MACH_NOKIA_N810_WIMAX
- bool
+ bool
config MACH_NOKIA_N8X0
bool "Nokia N800/N810"