summaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-08 20:27:13 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-08 20:27:13 +0200
commit7698fdedcfa3cab3dd40c9b685590b23be02e267 (patch)
tree207ddae0f963174356b1a9de7fff8e48a9c1e9c1 /arch/m68k
parentMerge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into ... (diff)
parent[ARM] Kirkwood: platform device registration for the crypto engine (diff)
downloadlinux-7698fdedcfa3cab3dd40c9b685590b23be02e267.tar.xz
linux-7698fdedcfa3cab3dd40c9b685590b23be02e267.zip
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/include/asm/flat.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/flat.h b/arch/m68k/include/asm/flat.h
index 814b5174a8e0..a0e290793978 100644
--- a/arch/m68k/include/asm/flat.h
+++ b/arch/m68k/include/asm/flat.h
@@ -5,7 +5,6 @@
#ifndef __M68KNOMMU_FLAT_H__
#define __M68KNOMMU_FLAT_H__
-#define flat_stack_align(sp) /* nothing needed */
#define flat_argvp_envp_on_stack() 1
#define flat_old_ram_flag(flags) (flags)
#define flat_reloc_valid(reloc, size) ((reloc) <= (size))