Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

frv: unbreak misalignment handling changes

Fix a reference in a arch/frv/mm/Makefile to unaligned.c which has now been
deleted.

Also revert the change to the guard macro name in include/asm-frv/unaligned.h.

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

David Howells and committed by
Linus Torvalds
adafbedf e5e41723

+4 -4
+1 -1
arch/frv/mm/Makefile
··· 6 6 7 7 obj-$(CONFIG_MMU) += \ 8 8 pgalloc.o highmem.o fault.o extable.o cache-page.o tlb-flush.o tlb-miss.o \ 9 - mmu-context.o dma-alloc.o unaligned.o elf-fdpic.o 9 + mmu-context.o dma-alloc.o elf-fdpic.o
+3 -3
include/asm-frv/unaligned.h
··· 9 9 * 2 of the License, or (at your option) any later version. 10 10 */ 11 11 12 - #ifndef _ASM_FRV_UNALIGNED_H 13 - #define _ASM_FRV_UNALIGNED_H 12 + #ifndef _ASM_UNALIGNED_H 13 + #define _ASM_UNALIGNED_H 14 14 15 15 #include <linux/unaligned/le_byteshift.h> 16 16 #include <linux/unaligned/be_byteshift.h> ··· 19 19 #define get_unaligned __get_unaligned_be 20 20 #define put_unaligned __put_unaligned_be 21 21 22 - #endif /* _ASM_FRV_UNALIGNED_H */ 22 + #endif /* _ASM_UNALIGNED_H */