aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/include/asm/flat.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-08 19:27:13 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-08 19:27:13 +0100
commit7698fdedcfa3cab3dd40c9b685590b23be02e267 (patch)
tree207ddae0f963174356b1a9de7fff8e48a9c1e9c1 /arch/blackfin/include/asm/flat.h
parent2d8d24935d372175786ebefa8a2de8680831b67f (diff)
parentae5c8c83735f5fcb09b380944e4854a383006998 (diff)
downloadkernel_samsung_smdk4412-7698fdedcfa3cab3dd40c9b685590b23be02e267.tar.gz
kernel_samsung_smdk4412-7698fdedcfa3cab3dd40c9b685590b23be02e267.tar.bz2
kernel_samsung_smdk4412-7698fdedcfa3cab3dd40c9b685590b23be02e267.zip
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'arch/blackfin/include/asm/flat.h')
-rw-r--r--arch/blackfin/include/asm/flat.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/blackfin/include/asm/flat.h b/arch/blackfin/include/asm/flat.h
index e70074e05f4..733a178d782 100644
--- a/arch/blackfin/include/asm/flat.h
+++ b/arch/blackfin/include/asm/flat.h
@@ -10,7 +10,6 @@
#include <asm/unaligned.h>
-#define flat_stack_align(sp) /* nothing needed */
#define flat_argvp_envp_on_stack() 0
#define flat_old_ram_flag(flags) (flags)