diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:01:25 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:01:25 -0500 |
| commit | 459d2a9f5fcf125ba736f7843189ccdfba11b1ff (patch) | |
| tree | 6664f0ae653081521a3e1df0c506a2532ae6168e /arch/mips/cavium-octeon/executive/cvmx-l2c.c | |
| parent | 1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (diff) | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
Diffstat (limited to 'arch/mips/cavium-octeon/executive/cvmx-l2c.c')
| -rw-r--r-- | arch/mips/cavium-octeon/executive/cvmx-l2c.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/executive/cvmx-l2c.c b/arch/mips/cavium-octeon/executive/cvmx-l2c.c index d38246e33ddb..9f883bf76953 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-l2c.c +++ b/arch/mips/cavium-octeon/executive/cvmx-l2c.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * measurement, and debugging facilities. | 30 | * measurement, and debugging facilities. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/irqflags.h> | ||
| 33 | #include <asm/octeon/cvmx.h> | 34 | #include <asm/octeon/cvmx.h> |
| 34 | #include <asm/octeon/cvmx-l2c.h> | 35 | #include <asm/octeon/cvmx-l2c.h> |
| 35 | #include <asm/octeon/cvmx-spinlock.h> | 36 | #include <asm/octeon/cvmx-spinlock.h> |