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

Commit 8a88ca8f authored by Ralf Baechle's avatar Ralf Baechle
Browse files

[MIPS] Fix merge screwup by patch(1) 



Patch happily applied an Ocelot G patch to Ocelot C when merging
linux-mips.org changeset 91ee9a801e65d2981dfe327d2519c7fc6ab02e6b into
kernel.org as 6ceb6d3a.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 84278297

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ config MOMENCO_OCELOT_C 
	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_BIG_ENDIAN

	help

	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by
@@ -425,7 +425,7 @@ config MOMENCO_OCELOT_G 
	select SWAP_IO_SPACE

	select SYS_HAS_CPU_RM7000

	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL

	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN

	select SYS_SUPPORTS_BIG_ENDIAN

	help

	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by