tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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 6ceb6d3ab2d402cea326320a4143db90a66fd216.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

Ralf Baechle 8a88ca8f 84278297

+2 -2
unified split
+2 -2
arch/mips/Kconfig
··· 408 select SWAP_IO_SPACE 409 select SYS_HAS_CPU_RM7000 410 select SYS_SUPPORTS_32BIT_KERNEL 411 - select SYS_SUPPORTS_64BIT_KERNEL if BROKEN 412 select SYS_SUPPORTS_BIG_ENDIAN 413 help 414 The Ocelot is a MIPS-based Single Board Computer (SBC) made by ··· 425 select SWAP_IO_SPACE 426 select SYS_HAS_CPU_RM7000 427 select SYS_SUPPORTS_32BIT_KERNEL 428 - select SYS_SUPPORTS_64BIT_KERNEL 429 select SYS_SUPPORTS_BIG_ENDIAN 430 help 431 The Ocelot is a MIPS-based Single Board Computer (SBC) made by
··· 408 select SWAP_IO_SPACE 409 select SYS_HAS_CPU_RM7000 410 select SYS_SUPPORTS_32BIT_KERNEL 411 + select SYS_SUPPORTS_64BIT_KERNEL 412 select SYS_SUPPORTS_BIG_ENDIAN 413 help 414 The Ocelot is a MIPS-based Single Board Computer (SBC) made by ··· 425 select SWAP_IO_SPACE 426 select SYS_HAS_CPU_RM7000 427 select SYS_SUPPORTS_32BIT_KERNEL 428 + select SYS_SUPPORTS_64BIT_KERNEL if BROKEN 429 select SYS_SUPPORTS_BIG_ENDIAN 430 help 431 The Ocelot is a MIPS-based Single Board Computer (SBC) made by