summaryrefslogtreecommitdiffstats
path: root/arch/m68k/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-03 10:52:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-03 10:52:41 -0700
commit587a9e1f95794c05419d3bdb4c409a3274849f93 (patch)
tree0c0e8041fbfa45210345ee58e47f329955e65692 /arch/m68k/Kconfig
parent0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff)
parent9e2760d18b3cf179534bbc27692c84879c61b97c (diff)
downloadlinux-587a9e1f95794c05419d3bdb4c409a3274849f93.tar.gz
linux-587a9e1f95794c05419d3bdb4c409a3274849f93.tar.bz2
linux-587a9e1f95794c05419d3bdb4c409a3274849f93.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Make sys_atomic_cmpxchg_32 work on classic m68k m68k/apollo: Rename "timer" to "apollo_timer" zorro: Remove unused zorro_bus.devices m68k: Remove never used asm/shm.h m68k/sun3: Remove unselectable code in prom_init() m68k: Use asm-generic version of <asm/sections.h> m68k: Replace m68k-specific _[se]bss by generic __bss_{start,stop} mtd/uclinux: Use generic __bss_stop instead of _ebss m68knommu: Allow ColdFire CPUs to use unaligned accesses m68k: Remove five unused headers m68k: CPU32 does not support unaligned accesses m68k: Introduce config option CPU_HAS_NO_UNALIGNED m68k: delay, muldi3 - Use CONFIG_CPU_HAS_NO_MULDIV64 m68k: Move CPU_HAS_* config options m68k: Remove duplicate FPU config option m68knommu: Clean up printing of sections m68k: Use asm-generic version of <asm/types.h> m68k: Use Kbuild logic to import asm-generic headers
Diffstat (limited to 'arch/m68k/Kconfig')
-rw-r--r--arch/m68k/Kconfig12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 0b0f8b8c4a26..4a469907f04a 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -54,18 +54,6 @@ config ZONE_DMA
bool
default y
-config CPU_HAS_NO_BITFIELDS
- bool
-
-config CPU_HAS_NO_MULDIV64
- bool
-
-config CPU_HAS_ADDRESS_SPACES
- bool
-
-config FPU
- bool
-
config HZ
int
default 1000 if CLEOPATRA