diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-30 12:57:00 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-30 12:57:17 -0500 |
| commit | 011d3090c8dce483c842a4cecf9ae5afe3e29670 (patch) | |
| tree | 4eaaa5b5a0b5e0cf17b0a1b1475f6e0211a97edf | |
| parent | 79870b7bca5a23c4b263b9a3335c67f1a7829f3e (diff) | |
| parent | 5e51651de30677f9d36805de9c261bf80f415790 (diff) | |
Merge branch 'sunxi/soc2' into next/soc
Adding one patch to fix build error.
* sunxi/soc2:
ARM: sunxi: add missing include for mdelay()
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-sunxi/sunxi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c index dc634ae2081f..9be910f7920b 100644 --- a/arch/arm/mach-sunxi/sunxi.c +++ b/arch/arm/mach-sunxi/sunxi.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * warranty of any kind, whether express or implied. | 10 | * warranty of any kind, whether express or implied. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/delay.h> | ||
| 13 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |