aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p6442/cpu.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-10-19 04:13:00 -0400
committerChris Wilson <chris@chris-wilson.co.uk>2010-10-19 04:14:50 -0400
commitfb9a90f7c674f3ddef6baf55cb1612dadd8ea752 (patch)
treef25cf2ce17449ba34cdfdfb948134eb3464e400e /arch/arm/mach-s5p6442/cpu.c
parent2d7b8366ae4a9ec2183c30e432a4a9a495c82bcd (diff)
parent21c74a8ea8b47eb6c3c621e36578f6e27f65c5c7 (diff)
Merge remote branch 'airlied/drm-core-next' into tmp
Diffstat (limited to 'arch/arm/mach-s5p6442/cpu.c')
-rw-r--r--arch/arm/mach-s5p6442/cpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6442/cpu.c b/arch/arm/mach-s5p6442/cpu.c
index a48fb553fd01..70ac681af72b 100644
--- a/arch/arm/mach-s5p6442/cpu.c
+++ b/arch/arm/mach-s5p6442/cpu.c
@@ -19,6 +19,7 @@
19#include <linux/sysdev.h> 19#include <linux/sysdev.h>
20#include <linux/serial_core.h> 20#include <linux/serial_core.h>
21#include <linux/platform_device.h> 21#include <linux/platform_device.h>
22#include <linux/sched.h>
22 23
23#include <asm/mach/arch.h> 24#include <asm/mach/arch.h>
24#include <asm/mach/map.h> 25#include <asm/mach/map.h>