Pull virt-cpu-accounting into release branch

[linux-2.6] / include / asm-sparc64 / cputime.h

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>