---

yaml --- r: 334674 b: refs/heads/master c: aeed41a h: refs/heads/master v: v3
git-mirror · Oct 20, 2012 · 6d5cf73 · 6d5cf73
1 parent 9613a2e
commit 6d5cf73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f34a1da35aed7b438a2de8ac27723a5472e8399
+refs/heads/master: aeed41a9371ee02257b608eb06a9058507a7d0f4
diff --git a/trunk/arch/arm64/include/asm/Kbuild b/trunk/arch/arm64/include/asm/Kbuild
@@ -18,7 +18,6 @@ generic-y += ipcbuf.h
 generic-y += irq_regs.h
 generic-y += kdebug.h
 generic-y += kmap_types.h
-generic-y += linkage.h
 generic-y += local.h
 generic-y += local64.h
 generic-y += mman.h

diff --git a/trunk/arch/arm64/include/asm/linkage.h b/trunk/arch/arm64/include/asm/linkage.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+#define __ALIGN		.align 4
+#define __ALIGN_STR	".align 4"
+
+#endif