diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-27 14:27:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-27 14:27:56 +0100 |
| commit | 0cab71e7014dc73a84e1d14d9b02e39c48241580 (patch) | |
| tree | 17b25202f70b62d43bca6bdf6ca9dc61f3daf0aa /arch/mips/kernel/time.c | |
| parent | 7d5f880b46f222ff83a76fd36b01f5a59bf32122 (diff) | |
| parent | 3e2bd64d243ff0f3dc08c49ff218fed42ee9d981 (diff) | |
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
Conflicts:
drivers/spi/spi-s3c64xx.c
Diffstat (limited to 'arch/mips/kernel/time.c')
| -rw-r--r-- | arch/mips/kernel/time.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c index 364d26ae4215..dcb8e5d3bb8a 100644 --- a/arch/mips/kernel/time.c +++ b/arch/mips/kernel/time.c @@ -24,6 +24,7 @@ #include <linux/export.h> #include <asm/cpu-features.h> +#include <asm/cpu-type.h> #include <asm/div64.h> #include <asm/smtc_ipi.h> #include <asm/time.h> |