diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 15:34:05 +0100 |
| commit | d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch) | |
| tree | 250be7a5a29069f7d1f4524fa45ab0e988833025 /include/asm-xtensa/cputime.h | |
| parent | 490dea45d00f01847ebebd007685d564aaf2cd98 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | talos-obmc-linux-d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a.tar.gz talos-obmc-linux-d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a.zip | |
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'include/asm-xtensa/cputime.h')
| -rw-r--r-- | include/asm-xtensa/cputime.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-xtensa/cputime.h b/include/asm-xtensa/cputime.h deleted file mode 100644 index a7fb864a50ae..000000000000 --- a/include/asm-xtensa/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _XTENSA_CPUTIME_H -#define _XTENSA_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* _XTENSA_CPUTIME_H */ |
