projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c25801 eeda4cb)
Merge branch 'bcm/cleanup' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:44:17 +0000 (00:44 +0200)
committerArnd 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 9f19636fea2f656392c84fdff74f08e909db14ca,28f90a01e3acbe585e8550ccc61773027a8dd643..b8cc9e8992f1ba23ccc0c8bc106db7746bc9b5fd
--- 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
John Crispins staging tree