diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /include/asm-blackfin/cputime.h | |
| parent | sparc32: Use PROM device probing for sun4m timer registers. (diff) | |
| parent | sparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff) | |
| download | linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'include/asm-blackfin/cputime.h')
| -rw-r--r-- | include/asm-blackfin/cputime.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-blackfin/cputime.h b/include/asm-blackfin/cputime.h deleted file mode 100644 index 2b19705f9885..000000000000 --- a/include/asm-blackfin/cputime.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __BLACKFIN_CPUTIME_H -#define __BLACKFIN_CPUTIME_H - -#include <asm-generic/cputime.h> - -#endif /* __BLACKFIN_CPUTIME_H */ |