diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 08:30:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-25 08:30:35 -0700 |
commit | 4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85 (patch) | |
tree | 99cc41c06ade46f9925268728417c9529ce5041e /arch/cris/arch-v10/lib | |
parent | 92bf3d09410531a06e06504957271e3978f937e2 (diff) | |
parent | 7b91747d42a1012e3781dd09fa638d113809e3fd (diff) | |
download | linux-4b7eba49c5912cbd7c70bbebec38d8cd54c2ef85.tar.gz |
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/lib')
-rw-r--r-- | arch/cris/arch-v10/lib/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/cris/arch-v10/lib/Makefile b/arch/cris/arch-v10/lib/Makefile index 36e9a9c5239b..725153edb764 100644 --- a/arch/cris/arch-v10/lib/Makefile +++ b/arch/cris/arch-v10/lib/Makefile @@ -2,8 +2,5 @@ # Makefile for Etrax-specific library files.. # - -EXTRA_AFLAGS := -traditional - lib-y = checksum.o checksumcopy.o string.o usercopy.o memset.o csumcpfruser.o |