summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@snapgear.com>2006-06-26 02:33:10 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 02:43:33 +0200
commit36a248fadf96cd78c6b344442046db5b85cf9a70 (patch)
tree248bd3e5d12e486f6d619ce02cd75b136abfefba /arch
parent[PATCH] m68knommu: read/write register access for ColdFire core timer (diff)
downloadlinux-36a248fadf96cd78c6b344442046db5b85cf9a70.tar.xz
linux-36a248fadf96cd78c6b344442046db5b85cf9a70.zip
[PATCH] m68knommu: switch arch config name to CONFIG_M68K
Switch to naming the architecture config options for the m68knommu branch as "M68K", dropping "M68KNOMMU". The CONFIG_MMU separates the 2 now, and the m68knommu branch is still strictly speaking an M68K (including the ColdFire parts). Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68knommu/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index 3cde6822ead1..d3dcdc9609ee 100644
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -5,7 +5,7 @@
mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
-config M68KNOMMU
+config M68K
bool
default y