Commit adafbedf authored by David Howells's avatar David Howells Committed by Linus Torvalds

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: default avatarDavid Howells <dhowells@redhat.com>
Cc: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5e41723
...@@ -6,4 +6,4 @@ obj-y := init.o kmap.o ...@@ -6,4 +6,4 @@ obj-y := init.o kmap.o
obj-$(CONFIG_MMU) += \ obj-$(CONFIG_MMU) += \
pgalloc.o highmem.o fault.o extable.o cache-page.o tlb-flush.o tlb-miss.o \ pgalloc.o highmem.o fault.o extable.o cache-page.o tlb-flush.o tlb-miss.o \
mmu-context.o dma-alloc.o unaligned.o elf-fdpic.o mmu-context.o dma-alloc.o elf-fdpic.o
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#ifndef _ASM_FRV_UNALIGNED_H #ifndef _ASM_UNALIGNED_H
#define _ASM_FRV_UNALIGNED_H #define _ASM_UNALIGNED_H
#include <linux/unaligned/le_byteshift.h> #include <linux/unaligned/le_byteshift.h>
#include <linux/unaligned/be_byteshift.h> #include <linux/unaligned/be_byteshift.h>
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
#define get_unaligned __get_unaligned_be #define get_unaligned __get_unaligned_be
#define put_unaligned __put_unaligned_be #define put_unaligned __put_unaligned_be
#endif /* _ASM_FRV_UNALIGNED_H */ #endif /* _ASM_UNALIGNED_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment