From: David S. Miller <davem@sunset.davemloft.net>
Date: Fri, 16 Nov 2007 10:42:29 +0000 (-0800)
Subject: [SPARC]: Merge include/asm-sparc{,64}/auxvec.h
X-Git-Tag: v2.6.25-rc1~9^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9ab8273606f1767c8ea900ac299cb42457b00323;p=linux-2.6-omap-h63xx.git

[SPARC]: Merge include/asm-sparc{,64}/auxvec.h

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/asm-sparc64/auxvec.h b/include/asm-sparc64/auxvec.h
index 436a2912982..1f45c67d731 100644
--- a/include/asm-sparc64/auxvec.h
+++ b/include/asm-sparc64/auxvec.h
@@ -1,4 +1 @@
-#ifndef __ASM_SPARC64_AUXVEC_H
-#define __ASM_SPARC64_AUXVEC_H
-
-#endif /* !(__ASM_SPARC64_AUXVEC_H) */
+#include <asm-sparc/auxvec.h>