diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-07 20:08:56 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-07 20:08:56 +0200 |
| commit | 5a89770daad83df74d77a8d34a1ffaedae565ce9 (patch) | |
| tree | 0d8ef70293a6ef969ba8b7718e59608337643d40 /arch/blackfin/include/asm/cputime.h | |
| parent | [ARM] 5278/1: i2c-pxa fast mode support (diff) | |
| parent | Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im (diff) | |
| download | linux-5a89770daad83df74d77a8d34a1ffaedae565ce9.tar.xz linux-5a89770daad83df74d77a8d34a1ffaedae565ce9.zip | |
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all
Conflicts:
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
Diffstat (limited to 'arch/blackfin/include/asm/cputime.h')
| -rw-r--r-- | arch/blackfin/include/asm/cputime.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/cputime.h b/arch/blackfin/include/asm/cputime.h new file mode 100644 index 000000000000..2b19705f9885 --- /dev/null +++ b/arch/blackfin/include/asm/cputime.h @@ -0,0 +1,6 @@ +#ifndef __BLACKFIN_CPUTIME_H +#define __BLACKFIN_CPUTIME_H + +#include <asm-generic/cputime.h> + +#endif /* __BLACKFIN_CPUTIME_H */ |