From: David Howells Date: Thu, 1 May 2008 11:34:24 +0000 (-0700) Subject: frv: unbreak misalignment handling changes X-Git-Tag: v2.6.26-rc1~91 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=adafbedf0c31ae1cde62035c82857f5e376af553;p=linux-2.6-omap-h63xx.git 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 Cc: Harvey Harrison Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/frv/mm/Makefile b/arch/frv/mm/Makefile index fb8b1d860f4..1bca5ab8a6a 100644 --- a/arch/frv/mm/Makefile +++ b/arch/frv/mm/Makefile @@ -6,4 +6,4 @@ obj-y := init.o kmap.o obj-$(CONFIG_MMU) += \ 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 diff --git a/include/asm-frv/unaligned.h b/include/asm-frv/unaligned.h index 64ccc736f2d..839a2fbffa0 100644 --- a/include/asm-frv/unaligned.h +++ b/include/asm-frv/unaligned.h @@ -9,8 +9,8 @@ * 2 of the License, or (at your option) any later version. */ -#ifndef _ASM_FRV_UNALIGNED_H -#define _ASM_FRV_UNALIGNED_H +#ifndef _ASM_UNALIGNED_H +#define _ASM_UNALIGNED_H #include #include @@ -19,4 +19,4 @@ #define get_unaligned __get_unaligned_be #define put_unaligned __put_unaligned_be -#endif /* _ASM_FRV_UNALIGNED_H */ +#endif /* _ASM_UNALIGNED_H */