Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cec6dc5d732c649e5f477c21c93d99eb25edae1e
Commit:     cec6dc5d732c649e5f477c21c93d99eb25edae1e
Parent:     d113fcd9cf807045e38998a60b4f4577c927c300
Author:     David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 16 03:08:39 2007 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Feb 9 04:17:47 2008 -0800

    [SPARC]: Merge asm-sparc{,64}/cputime.h
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 include/asm-sparc64/cputime.h |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/include/asm-sparc64/cputime.h b/include/asm-sparc64/cputime.h
index dec2fc7..435f37a 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>
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to