Skip to content

Commit 56fdaf4

Browse files
committed
Merge tag 'arm-soc/for-6.6/soc' of https://github.com/Broadcom/stblinux into soc/arm
This pull request contains Broadcom platforms updates for 6.6, please pull the following: - Rob updates the Broadcom machine level code to use the correct DT includes * tag 'arm-soc/for-6.6/soc' of https://github.com/Broadcom/stblinux: ARM: bcm: Drop unused includes Link: https://lore.kernel.org/r/20230818164539.2871539-4-florian.fainelli@broadcom.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 446f0a4 + 91b631c commit 56fdaf4

File tree

4 files changed

+1
-6
lines changed

4 files changed

+1
-6
lines changed

arch/arm/mach-bcm/bcm_5301x.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*
66
* Licensed under the GNU/GPL. See COPYING for details.
77
*/
8-
#include <linux/of_platform.h>
9-
#include <asm/hardware/cache-l2x0.h>
108

119
#include <asm/mach/arch.h>
1210
#include <asm/siginfo.h>

arch/arm/mach-bcm/board_bcm23550.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
// Copyright (C) 2016 Broadcom
33

4-
#include <linux/of_platform.h>
5-
64
#include <asm/mach/arch.h>
75

86
static const char * const bcm23550_dt_compat[] = {

arch/arm/mach-bcm/brcmstb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#include <linux/init.h>
55
#include <linux/irqchip.h>
6-
#include <linux/of_platform.h>
76

87
#include <asm/mach-types.h>
98
#include <asm/mach/arch.h>

arch/arm/mach-bcm/platsmp-brcmstb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#include <linux/init.h>
1111
#include <linux/io.h>
1212
#include <linux/jiffies.h>
13+
#include <linux/of.h>
1314
#include <linux/of_address.h>
14-
#include <linux/of_platform.h>
1515
#include <linux/printk.h>
1616
#include <linux/regmap.h>
1717
#include <linux/smp.h>

0 commit comments

Comments
 (0)