Skip to content

Commit 6e51b4b

Browse files
committed
Merge tag 'mips_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer: "Just cleanups and fixes" * tag 'mips_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (24 commits) MIPS: Take in account load hazards for HI/LO restoring MIPS: SGI-IP27: use WARN_ON() output MIPS: SGI-IP27: fix -Wunused-variable in arch_init_irq() MIPS: SGI-IP27: micro-optimize arch_init_irq() mips: dts: ralink: mt7621: reorder the attributes of the root node mips: dts: ralink: mt7621: reorder pci?_phy attributes mips: dts: ralink: mt7621: reorder pcie node attributes and children mips: dts: ralink: mt7621: reorder ethernet node attributes and kids mips: dts: ralink: mt7621: reorder gic node attributes mips: dts: ralink: mt7621: reorder mmc node attributes mips: dts: ralink: mt7621: move pinctrl and sort its children mips: dts: ralink: mt7621: reorder spi0 node attributes mips: dts: ralink: mt7621: reorder i2c node attributes mips: dts: ralink: mt7621: reorder gpio node attributes mips: dts: ralink: mt7621: reorder sysc node attributes mips: dts: ralink: mt7621: reorder mmc regulator attributes mips: dts: ralink: mt7621: reorder cpuintc node attributes mips: dts: ralink: mt7621: reorder cpu node attributes MIPS: Add prototypes for plat_post_relocation() and relocate_kernel() MIPS: Octeon: Add PCIe link status check ...
2 parents 80f9d90 + 07e6a6d commit 6e51b4b

File tree

9 files changed

+274
-212
lines changed

9 files changed

+274
-212
lines changed

arch/mips/bcm47xx/prom.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include <asm/bootinfo.h>
3636
#include <bcm47xx.h>
3737
#include <bcm47xx_board.h>
38+
#include "bcm47xx_private.h"
3839

3940
static char bcm47xx_system_type[20] = "Broadcom BCM47XX";
4041

@@ -123,7 +124,7 @@ void __init prom_init(void)
123124
/* Stripped version of tlb_init, with the call to build_tlb_refill_handler
124125
* dropped. Calling it at this stage causes a hang.
125126
*/
126-
void early_tlb_init(void)
127+
static void early_tlb_init(void)
127128
{
128129
write_c0_pagemask(PM_DEFAULT_MASK);
129130
write_c0_wired(0);

0 commit comments

Comments
 (0)