]> err.no Git - linux-2.6/commitdiff
[MIPS] Fix merge screwup by patch(1)
authorRalf Baechle <ralf@linux-mips.org>
Thu, 2 Nov 2006 17:23:33 +0000 (17:23 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 2 Nov 2006 17:23:33 +0000 (17:23 +0000)
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>
arch/mips/Kconfig

index 76f1cea6ddc93f10971ce778812c5bae9aee152a..848089ecb64d0e7106a94cea3a6f6ff846bb190c 100644 (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