From 88a6fa26799ab1c2afa01f1026fe3faf4b7a5cfe Mon Sep 17 00:00:00 2001
From: Luis Alves <ljalvs@gmail.com>
Date: Thu, 25 Oct 2012 21:01:16 +0100
Subject: [PATCH] --- yaml --- r: 344919 b: refs/heads/master c:
 9da1a84a9125dab0c95f045068e36512334ab473 h: refs/heads/master i:   344917:
 5694f4e0ef1df214507854e5da7e0e6b3e47ccae   344915:
 6460dfd9b7c519bd6cbea9d33403502d3759eb05   344911:
 8c8836f2f464d2ff4e717ba39557fe4c1ef09a21 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/m68k/Kconfig.cpu | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 774914057ebd..2fdc87b3947d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4674e8d385c34498a329fc31b41f449dc419014d
+refs/heads/master: 9da1a84a9125dab0c95f045068e36512334ab473
diff --git a/trunk/arch/m68k/Kconfig.cpu b/trunk/arch/m68k/Kconfig.cpu
index aad3b0bad7de..6708fa48e895 100644
--- a/trunk/arch/m68k/Kconfig.cpu
+++ b/trunk/arch/m68k/Kconfig.cpu
@@ -36,6 +36,7 @@ if M68KCLASSIC
 
 config M68000
 	bool "MC68000"
+	depends on !MMU
 	select CPU_HAS_NO_BITFIELDS
 	select CPU_HAS_NO_MULDIV64
 	select CPU_HAS_NO_UNALIGNED