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

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

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

diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h
index dec2fc7a36f..435f37a92f7 100644
--- a/include/asm-sparc64/cputime.h
+++ b/include/asm-sparc64/cputime.h
@@ -1,6 +1 @@
-#ifndef __SPARC64_CPUTIME_H
-#define __SPARC64_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __SPARC64_CPUTIME_H */
+#include <asm-sparc/cputime.h>