Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit cec6dc5d732c649e5f477c21c93d99eb25edae1e

Authored by David S. Miller
Committed by David S. Miller
1 parent d113fcd9cf
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[SPARC]: Merge asm-sparc{,64}/cputime.h 

Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 1 additions and 6 deletions Side-by-side Diff

include/asm-sparc64/cputime.h
Diff comments   View file @ cec6dc5
1   -#ifndef __SPARC64_CPUTIME_H
2   -#define __SPARC64_CPUTIME_H
3   -
4   -#include <asm-generic/cputime.h>
5   -
6   -#endif /* __SPARC64_CPUTIME_H */
  1 +#include <asm-sparc/cputime.h>