diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-11-02 12:23:33 -0500 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-11-02 12:23:33 -0500 |
| commit | 8a88ca8f7fd15d06e53a848c6b3558ed9973327c (patch) | |
| tree | a2c6f538a04ade1758a64e0c877e9b817da83d5f /arch | |
| parent | 8427829711b35e0e62668618cec577f65c102935 (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 76f1cea6ddc9..848089ecb64d 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
| @@ -408,7 +408,7 @@ config MOMENCO_OCELOT_C | |||
| 408 | select SWAP_IO_SPACE | 408 | select SWAP_IO_SPACE |
| 409 | select SYS_HAS_CPU_RM7000 | 409 | select SYS_HAS_CPU_RM7000 |
| 410 | select SYS_SUPPORTS_32BIT_KERNEL | 410 | select SYS_SUPPORTS_32BIT_KERNEL |
| 411 | select SYS_SUPPORTS_64BIT_KERNEL if BROKEN | 411 | select SYS_SUPPORTS_64BIT_KERNEL |
| 412 | select SYS_SUPPORTS_BIG_ENDIAN | 412 | select SYS_SUPPORTS_BIG_ENDIAN |
| 413 | help | 413 | help |
| 414 | The Ocelot is a MIPS-based Single Board Computer (SBC) made by | 414 | The Ocelot is a MIPS-based Single Board Computer (SBC) made by |
| @@ -425,7 +425,7 @@ config MOMENCO_OCELOT_G | |||
| 425 | select SWAP_IO_SPACE | 425 | select SWAP_IO_SPACE |
| 426 | select SYS_HAS_CPU_RM7000 | 426 | select SYS_HAS_CPU_RM7000 |
| 427 | select SYS_SUPPORTS_32BIT_KERNEL | 427 | select SYS_SUPPORTS_32BIT_KERNEL |
| 428 | select SYS_SUPPORTS_64BIT_KERNEL | 428 | select SYS_SUPPORTS_64BIT_KERNEL if BROKEN |
| 429 | select SYS_SUPPORTS_BIG_ENDIAN | 429 | select SYS_SUPPORTS_BIG_ENDIAN |
| 430 | help | 430 | help |
| 431 | The Ocelot is a MIPS-based Single Board Computer (SBC) made by | 431 | The Ocelot is a MIPS-based Single Board Computer (SBC) made by |