aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-01-22 22:35:38 +0100
committerGreg Ungerer <gerg@uclinux.org>2011-02-08 15:07:44 +1000
commit73020415564a3fe4931f3f70f500a5db13eea946 (patch)
tree9363beed576c0b1fae011f7e8bebeb6a73934e4f
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
downloadkernel_samsung_espresso10-73020415564a3fe4931f3f70f500a5db13eea946.zip
kernel_samsung_espresso10-73020415564a3fe4931f3f70f500a5db13eea946.tar.gz
kernel_samsung_espresso10-73020415564a3fe4931f3f70f500a5db13eea946.tar.bz2
m68knommu: Remove dependencies on nonexistent M68KNOMMU
M68KNOMMU is set nowhere. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
-rw-r--r--drivers/net/can/mscan/Kconfig2
-rw-r--r--lib/Kconfig.debug2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
index 27d1d39..d387069 100644
--- a/drivers/net/can/mscan/Kconfig
+++ b/drivers/net/can/mscan/Kconfig
@@ -1,5 +1,5 @@
config CAN_MSCAN
- depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+ depends on CAN_DEV && (PPC || M68K)
tristate "Support for Freescale MSCAN based chips"
---help---
The Motorola Scalable Controller Area Network (MSCAN) definition
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 3967c23..2b97418 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -805,7 +805,7 @@ config ARCH_WANT_FRAME_POINTERS
config FRAME_POINTER
bool "Compile the kernel with frame pointers"
depends on DEBUG_KERNEL && \
- (CRIS || M68K || M68KNOMMU || FRV || UML || \
+ (CRIS || M68K || FRV || UML || \
AVR32 || SUPERH || BLACKFIN || MN10300) || \
ARCH_WANT_FRAME_POINTERS
default y if (DEBUG_INFO && UML) || ARCH_WANT_FRAME_POINTERS