| commit | cec6dc5d732c649e5f477c21c93d99eb25edae1e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@sunset.davemloft.net> | Fri Nov 16 03:08:39 2007 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Sat Feb 09 04:17:47 2008 -0800 |
| tree | 2c5c144eb5f4de4326abfbd17de38512e10a39c7 | |
| parent | d113fcd9cf807045e38998a60b4f4577c927c300 [diff] [blame] |
[SPARC]: Merge asm-sparc{,64}/cputime.h
Signed-off-by: David S. Miller <davem@davemloft.net>
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>