diff options
| author | David Howells <dhowells@redhat.com> | 2008-05-01 04:34:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-01 08:03:58 -0700 |
| commit | adafbedf0c31ae1cde62035c82857f5e376af553 (patch) | |
| tree | 1c7caf07945bfc2d35f44f8b9c39514078afb535 | |
| parent | e5e417232e7c9ecc58a77902d2e8dd46792cd092 (diff) | |
| download | op-kernel-dev-adafbedf0c31ae1cde62035c82857f5e376af553.zip op-kernel-dev-adafbedf0c31ae1cde62035c82857f5e376af553.tar.gz | |
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>
| -rw-r--r-- | arch/frv/mm/Makefile | 2 | ||||
| -rw-r--r-- | include/asm-frv/unaligned.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/frv/mm/Makefile b/arch/frv/mm/Makefile index fb8b1d8..1bca5ab 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 64ccc73..839a2fb 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 <linux/unaligned/le_byteshift.h> #include <linux/unaligned/be_byteshift.h> @@ -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 */ |
