summaryrefslogtreecommitdiff
path: root/include/asm-sh
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-04 21:30:44 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-04 21:30:44 -0800
commit58a96a605ee4e5d573bec35c73bb6d015171cc16 (patch)
tree52d49ddf2e58f38f457a1e50ffc7254cd8683783 /include/asm-sh
parent55d411d0e475235b36343c10216657d96e9da156 (diff)
parent05e7304908ec281ce4ef29d1db58ec8d6fd73563 (diff)
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/asm-sh')
-rw-r--r--include/asm-sh/system.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sh/system.h b/include/asm-sh/system.h
index 5e67caf8885e..28a3c2d8bcd7 100644
--- a/include/asm-sh/system.h
+++ b/include/asm-sh/system.h
@@ -259,4 +259,6 @@ static __inline__ unsigned long __xchg(unsigned long x, volatile void * ptr, int
void disable_hlt(void);
void enable_hlt(void);
+#define arch_align_stack(x) (x)
+
#endif