Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[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 18 years ago
parent
8427829711
commit
8a88ca8f7f
1 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 2 2
      arch/mips/Kconfig

+ 2 - 2
arch/mips/Kconfig
View File 

@@ -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