diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-25 10:58:34 -0400 |
| commit | 4cafc4b8d7219b70e15f22e4a51b3ce847810caf (patch) | |
| tree | 8051ea3f36f0682d08f47df8e35e14ca7eb7a5d7 /arch/arm/mach-s5p6440/cpu.c | |
| parent | b47fad3bfb5940cc3e28a1c69716f6dc44e4b7e6 (diff) | |
| parent | dbd1e66e04558a582e673bc4a9cd933ce0228d93 (diff) | |
Merge branch 'oprofile/core' into oprofile/x86
Conflicts:
arch/x86/oprofile/op_model_amd.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/arm/mach-s5p6440/cpu.c')
| -rw-r--r-- | arch/arm/mach-s5p6440/cpu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6440/cpu.c b/arch/arm/mach-s5p6440/cpu.c index 526f33adb31d..ec592e866054 100644 --- a/arch/arm/mach-s5p6440/cpu.c +++ b/arch/arm/mach-s5p6440/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> |