projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3c25801
eeda4cb
)
Merge branch 'bcm/cleanup' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 23 May 2014 22:44:17 +0000
(
00:44
+0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 23 May 2014 22:44:17 +0000
(
00:44
+0200)
Conflicts:
arch/arm/mach-bcm/Kconfig
1
2
arch/arm/mach-bcm/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/arm/mach-bcm/Kconfig
index
9f19636
,
28f90a0
..
b8cc9e8
---
1
/
arch/arm/mach-bcm/Kconfig
---
2
/
arch/arm/mach-bcm/Kconfig
+++ b/
arch/arm/mach-bcm/Kconfig
@@@
-10,7
-10,8
+10,7
@@@
if ARCH_BC
menu "Broadcom SoC Selection"
config ARCH_BCM_MOBILE
- bool "Broadcom Mobile SoC" if ARCH_MULTI_V7
+ bool "Broadcom Mobile SoC
Support
" if ARCH_MULTI_V7
- depends on MMU
select ARCH_REQUIRE_GPIOLIB
select ARM_ERRATA_754322
select ARM_ERRATA_764369 if SMP