From: Olof Johansson Date: Wed, 30 Oct 2013 21:03:39 +0000 (-0700) Subject: Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6216650a7ab822b5fe3d2bb0b953486f3fb07376;p=linux-beck.git Merge tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351 into next/soc From Christian Daudt, BCM changes for 3.13/soc. Mostly cleanups and renaming of kernel config options, pushing down the mobile platforms one level in the naming scheme, keeping ARCH_BCM as a wider family config option. * tag 'bcm-for-3.13-soc2' of git://github.com/broadcom/bcm11351: ARM: bcm_defconfig: Run "make savedefconfig" ARM: bcm281xx: Add ARCH Timers to config rename ARCH_BCM to ARCH_BCM_MOBILE (mach-bcm) ARM: bcm281xx: more descriptive machine string ARM: bcm281xx: Enable GPIO driver Signed-off-by: Olof Johansson --- 6216650a7ab822b5fe3d2bb0b953486f3fb07376 diff --cc arch/arm/mach-bcm/board_bcm281xx.c index 26b2390492b8,dcfaf4ab25d6..cb3dc364405c --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@@ -67,7 -67,8 +67,7 @@@ static void __init board_init(void static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, }; - DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor") + DT_MACHINE_START(BCM11351_DT, "BCM281xx Broadcom Application Processor") - .init_time = clocksource_of_init, .init_machine = board_init, .restart = bcm_kona_restart, .dt_compat = bcm11351_dt_compat,