diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-03 07:52:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-03 07:52:21 +0200 |
| commit | 6c09f6d830d03b78717403e7b42838a2ee2987ae (patch) | |
| tree | 6436ab6a237578406e004c891e134afd266fb95d /arch/mips/cavium-octeon/csrc-octeon.c | |
| parent | 389e067032fbb96e439abafae848dd447e4cafb4 (diff) | |
| parent | 15c03dd4859ab16f9212238f29dd315654aa94f6 (diff) | |
| download | blackbird-op-linux-6c09f6d830d03b78717403e7b42838a2ee2987ae.tar.gz blackbird-op-linux-6c09f6d830d03b78717403e7b42838a2ee2987ae.zip | |
Merge tag 'v3.12-rc3' into timers/core
Merge Linux 3.12-rc3 - refresh the tree with the latest fixes before merging new bits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/cavium-octeon/csrc-octeon.c')
| -rw-r--r-- | arch/mips/cavium-octeon/csrc-octeon.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c index 02193953eb9e..b752c4ed0b79 100644 --- a/arch/mips/cavium-octeon/csrc-octeon.c +++ b/arch/mips/cavium-octeon/csrc-octeon.c @@ -12,6 +12,7 @@ #include <linux/smp.h> #include <asm/cpu-info.h> +#include <asm/cpu-type.h> #include <asm/time.h> #include <asm/octeon/octeon.h> |
