diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-30 22:03:39 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-30 22:03:39 +0100 |
| commit | 6216650a7ab822b5fe3d2bb0b953486f3fb07376 (patch) | |
| tree | 6729d5a962437ee12a0dad7a82f18c4506a11163 /arch/arm/mach-bcm/board_bcm281xx.c | |
| parent | ARM: vexpress: Enable platform-specific options in defconfig (diff) | |
| parent | ARM: bcm_defconfig: Run "make savedefconfig" (diff) | |
| download | linux-6216650a7ab822b5fe3d2bb0b953486f3fb07376.tar.xz linux-6216650a7ab822b5fe3d2bb0b953486f3fb07376.zip | |
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-bcm/board_bcm281xx.c')
| -rw-r--r-- | arch/arm/mach-bcm/board_bcm281xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c index 26b2390492b8..cb3dc364405c 100644 --- a/arch/arm/mach-bcm/board_bcm281xx.c +++ b/arch/arm/mach-bcm/board_bcm281xx.c @@ -67,7 +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_machine = board_init, .restart = bcm_kona_restart, .dt_compat = bcm11351_dt_compat, |