diff options
| author | Linus Torvalds | 2012-05-25 17:30:35 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2012-05-25 17:30:35 +0200 |
| commit | 4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85 (patch) | |
| tree | 99cc41c06ade46f9925268728417c9529ce5041e /arch/cris/arch-v10/kernel/fasttimer.c | |
| parent | Merge tag 'mmc-merge-for-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile (diff) | |
| download | kernel-qcow2-linux-4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85.tar.gz kernel-qcow2-linux-4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85.tar.xz kernel-qcow2-linux-4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85.zip | |
Merge tag 'cris-for-linus' of git://jni.nu/cris
Pull CRIS changes from Jesper Nilsson:
"No major changes here, but fixes some compile errors for CRIS, some
small style issues, some documentation and as a bonus nukes a couple
of obsolete rtc-files and related code."
* tag 'cris-for-linus' of git://jni.nu/cris:
cris: Remove old legacy "-traditional" flag from arch-v10/lib/Makefile
CRIS: Remove legacy RTC drivers
cris/mm/fault.c: Port OOM changes to do_page_fault
cris:fix the wrong function declear
CRIS: Add _sdata to vmlinux.lds.S
cris: posix_types.h, include asm-generic/posix_types.h
CRIS: Update documentation
cris/arch-v32: cryptocop: Use kzalloc
net:removed the unused variable
cris:removed the unused variable
CRISv32: Correct name of read_mostly section.
Diffstat (limited to 'arch/cris/arch-v10/kernel/fasttimer.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/fasttimer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c index 8a8196ee8ce8..082f1890bacb 100644 --- a/arch/cris/arch-v10/kernel/fasttimer.c +++ b/arch/cris/arch-v10/kernel/fasttimer.c @@ -21,8 +21,6 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/delay.h> -#include <asm/rtc.h> - #include <arch/svinto.h> #include <asm/fasttimer.h> |