From dcb5d167af73f52601f08f3c4585df879d87f55b Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Thu, 1 May 2008 04:34:24 -0700
Subject: [PATCH] --- yaml --- r: 95641 b: refs/heads/master c:
 adafbedf0c31ae1cde62035c82857f5e376af553 h: refs/heads/master i:   95639:
 d50614ba6002af4b3fcda4ebee9bd212244a0463 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/frv/mm/Makefile        | 2 +-
 trunk/include/asm-frv/unaligned.h | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 05dac81f136d..0e953c2edf37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5e417232e7c9ecc58a77902d2e8dd46792cd092
+refs/heads/master: adafbedf0c31ae1cde62035c82857f5e376af553
diff --git a/trunk/arch/frv/mm/Makefile b/trunk/arch/frv/mm/Makefile
index fb8b1d860f46..1bca5ab8a6ab 100644
--- a/trunk/arch/frv/mm/Makefile
+++ b/trunk/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/trunk/include/asm-frv/unaligned.h b/trunk/include/asm-frv/unaligned.h
index 64ccc736f2d8..839a2fbffa0f 100644
--- a/trunk/include/asm-frv/unaligned.h
+++ b/trunk/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 */