summaryrefslogtreecommitdiff
path: root/include/asm-sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-11-16 14:08:39 +0300
committerDavid S. Miller <davem@davemloft.net>2008-02-09 15:17:47 +0300
commitcec6dc5d732c649e5f477c21c93d99eb25edae1e (patch)
tree2c5c144eb5f4de4326abfbd17de38512e10a39c7 /include/asm-sparc64
parentd113fcd9cf807045e38998a60b4f4577c927c300 (diff)
downloadlinux-cec6dc5d732c649e5f477c21c93d99eb25edae1e.tar.xz
[SPARC]: Merge asm-sparc{,64}/cputime.h
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r--include/asm-sparc64/cputime.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h
index dec2fc7a36f8..435f37a92f7c 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>