diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 07:24:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-10 07:24:14 -0700 |
commit | 6019958d146a4f127dae727a930f902c92531e6e (patch) | |
tree | 126cfbdafb7008ce9701dd2ccc27c54cab2d36f4 /arch/arc/mm/Makefile | |
parent | 977b58e1dd6fc2a751fb427798bfb8256476c93e (diff) | |
parent | e7d5bab5efb94a82d80cab3ad68c357ce73ea596 (diff) |
Merge tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull second set of arc arch updates from Vineet Gupta:
"Aliasing VIPT dcache support for ARC
I'm satisified with testing, specially with fuse which has
historically given grief to VIPT arches (ARM/PARISC...)"
* tag 'arc-v3.10-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [TB10x] Remove GENERIC_GPIO
ARC: [mm] Aliasing VIPT dcache support 4/4
ARC: [mm] Aliasing VIPT dcache support 3/4
ARC: [mm] Aliasing VIPT dcache support 2/4
ARC: [mm] Aliasing VIPT dcache support 1/4
ARC: [mm] refactor the core (i|d)cache line ops loops
ARC: [mm] serious bug in vaddr based icache flush
Diffstat (limited to 'arch/arc/mm/Makefile')
-rw-r--r-- | arch/arc/mm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/mm/Makefile b/arch/arc/mm/Makefile index 168dc146a8f..ac95cc239c1 100644 --- a/arch/arc/mm/Makefile +++ b/arch/arc/mm/Makefile @@ -7,4 +7,4 @@ # obj-y := extable.o ioremap.o dma.o fault.o init.o -obj-y += tlb.o tlbex.o cache_arc700.o +obj-y += tlb.o tlbex.o cache_arc700.o mmap.o |