diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 09:56:01 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-10 09:56:01 +0200 |
| commit | 09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd (patch) | |
| tree | 79275c5e522c08012fab90cabb8af817fbe7c3ce /arch/arm/mach-mxs/ocotp.c | |
| parent | ARM: extend Code: line by one 16-bit quantity for Thumb instructions (diff) | |
| parent | ARM: mx51/sdma: Check the chip revision in run-time (diff) | |
| download | linux-09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd.tar.xz linux-09e1e9c4a4009a75c1dd716b6f0797fae3ab4dfd.zip | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-mxs/ocotp.c')
| -rw-r--r-- | arch/arm/mach-mxs/ocotp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-mxs/ocotp.c b/arch/arm/mach-mxs/ocotp.c index 65157a35dbba..54add60f94c9 100644 --- a/arch/arm/mach-mxs/ocotp.c +++ b/arch/arm/mach-mxs/ocotp.c @@ -16,6 +16,8 @@ #include <linux/err.h> #include <linux/mutex.h> +#include <asm/processor.h> /* for cpu_relax() */ + #include <mach/mxs.h> #define OCOTP_WORD_OFFSET 0x20 |