From cec6dc5d732c649e5f477c21c93d99eb25edae1e Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 16 Nov 2007 03:08:39 -0800
Subject: [PATCH] [SPARC]: Merge asm-sparc{,64}/cputime.h

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 include/asm-sparc64/cputime.h | 7 +------
 1 file changed, 1 insertion(+), 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>
-- 
2.20.1