diff options
| author | Catalin Marinas | 2012-11-13 18:36:07 +0100 |
|---|---|---|
| committer | Catalin Marinas | 2012-11-13 18:36:07 +0100 |
| commit | 6097a07411005c0184cf90256743c784079198fc (patch) | |
| tree | 0c6496aa7de5f00a60ed8e7bac4b34f5acc7e30a /arch/arm/include/asm/sched_clock.h | |
| parent | arm64: Use generic sys_execve() implementation (diff) | |
| parent | Linux 3.7-rc5 (diff) | |
| download | kernel-qcow2-linux-6097a07411005c0184cf90256743c784079198fc.tar.gz kernel-qcow2-linux-6097a07411005c0184cf90256743c784079198fc.tar.xz kernel-qcow2-linux-6097a07411005c0184cf90256743c784079198fc.zip | |
Merge tag 'v3.7-rc5' into execve
Linux 3.7-rc5
Conflicts:
arch/arm64/kernel/process.c
Diffstat (limited to 'arch/arm/include/asm/sched_clock.h')
| -rw-r--r-- | arch/arm/include/asm/sched_clock.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/sched_clock.h b/arch/arm/include/asm/sched_clock.h index 05b8e82ec9f5..e3f757263438 100644 --- a/arch/arm/include/asm/sched_clock.h +++ b/arch/arm/include/asm/sched_clock.h @@ -10,7 +10,5 @@ extern void sched_clock_postinit(void); extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate); -extern void setup_sched_clock_needs_suspend(u32 (*read)(void), int bits, - unsigned long rate); #endif |