diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 10:01:49 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 10:01:49 -0700 |
commit | d848223808c5d21e1b3cea090047e34722c6254b (patch) | |
tree | a869974378be9c20f311ad3d934eb3946e813a1a /include/asm-mn10300/linkage.h | |
parent | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (diff) | |
parent | 2f2a2132ff056bb45697dc855eb4fd95b70b38cb (diff) | |
download | linux-next-d848223808c5d21e1b3cea090047e34722c6254b.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
Separate out the proc- and unit-specific header directories from the general
Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/.
Diffstat (limited to 'include/asm-mn10300/linkage.h')
-rw-r--r-- | include/asm-mn10300/linkage.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-mn10300/linkage.h b/include/asm-mn10300/linkage.h deleted file mode 100644 index dda3002a5dfa..000000000000 --- a/include/asm-mn10300/linkage.h +++ /dev/null @@ -1,20 +0,0 @@ -/* MN10300 Linkage and calling-convention overrides - * - * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. - * Written by David Howells (dhowells@redhat.com) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public Licence - * as published by the Free Software Foundation; either version - * 2 of the Licence, or (at your option) any later version. - */ -#ifndef _ASM_LINKAGE_H -#define _ASM_LINKAGE_H - -/* don't override anything */ -#define asmlinkage - -#define __ALIGN .align 4,0xcb -#define __ALIGN_STR ".align 4,0xcb" - -#endif |