Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a06c39d2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix typo of "CONFIG_MT_SMP".
  [MIPS] Ocelot G: Fix a few misspellings of CONFIG_GALILEO_GT64240_ETH
  [PATCH] Malta: Fix build if CONFIG_MTD is diabled.
parents 08456d10 9616d54f

arch/mips/mips-boards/malta/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -19,5 +19,6 @@ 
# under Linux.

#



obj-y := malta_int.o malta_mtd.o malta_setup.o

obj-y := malta_int.o malta_setup.o

obj-$(CONFIG_MTD) += malta_mtd.o

obj-$(CONFIG_SMP) += malta_smp.o

arch/mips/mips-boards/sim/sim_setup.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void __init plat_mem_setup(void) 
	board_time_init = sim_time_init;

	prom_printf("Linux started...\n");



#ifdef CONFIG_MT_SMP

#ifdef CONFIG_MIPS_MT_SMP

	sanitize_tlb_entries();

#endif

}

arch/mips/momentum/ocelot_g/prom.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct callvectors* debug_vectors; 
extern unsigned long marvell_base;

extern unsigned long bus_clock;



#ifdef CONFIG_GALILLEO_GT64240_ETH

#ifdef CONFIG_GALILEO_GT64240_ETH

extern unsigned char prom_mac_addr_base[6];

#endif
@@ -61,7 +61,7 @@ void __init prom_init(void) 
	mips_machgroup = MACH_GROUP_MOMENCO;

	mips_machtype = MACH_MOMENCO_OCELOT_G;



#ifdef CONFIG_GALILLEO_GT64240_ETH

#ifdef CONFIG_GALILEO_GT64240_ETH

	/* get the base MAC address for on-board ethernet ports */

	memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6);

#endif

arch/mips/momentum/ocelot_g/setup.c

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 


#include "ocelot_pld.h"



#ifdef CONFIG_GALILLEO_GT64240_ETH

#ifdef CONFIG_GALILEO_GT64240_ETH

extern unsigned char prom_mac_addr_base[6];

#endif
@@ -185,7 +185,7 @@ void __init plat_mem_setup(void) 
	/* do handoff reconfiguration */

	PMON_v2_setup();



#ifdef CONFIG_GALILLEO_GT64240_ETH

#ifdef CONFIG_GALILEO_GT64240_ETH

	/* get the mac addr */

	memcpy(prom_mac_addr_base, (void*)0xfc807cf2, 6);

#endif