projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d113fcd)
[SPARC]: Merge asm-sparc{,64}/cputime.h
authorDavid S. Miller <davem@sunset.davemloft.net>
Fri, 16 Nov 2007 11:08:39 +0000 (03:08 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Feb 2008 12:17:47 +0000 (04:17 -0800)
Signed-off-by: David S. Miller <davem@davemloft.net>
include/asm-sparc64/cputime.h patch | blob | history

diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h
index dec2fc7a36f8dfa640b46a2dfe4ef167b9271ea6..435f37a92f7cd03a846fa8742d91c732d73df11c 100644 (file)
--- 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>
John Crispins staging tree