Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af85fe9e authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: use non-mmu version of unaligned.h for all m68k 



The non-mmu version is appropriately ifdef'ed to be used "as is"
on all m68k varients. So switch to it as the only unaligned.h.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent f358cbcd

arch/m68k/include/asm/unaligned.h

+23 −3
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "unaligned_no.h"

#ifndef _ASM_M68KNOMMU_UNALIGNED_H

#define _ASM_M68KNOMMU_UNALIGNED_H





#ifdef CONFIG_COLDFIRE

#include <linux/unaligned/be_struct.h>

#include <linux/unaligned/le_byteshift.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#else

#include "unaligned_mm.h"

/*

 * The m68k can do unaligned accesses itself. 

 */

#include <linux/unaligned/access_ok.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#endif



#endif /* _ASM_M68KNOMMU_UNALIGNED_H */

arch/m68k/include/asm/unaligned_mm.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef _ASM_M68K_UNALIGNED_H

#define _ASM_M68K_UNALIGNED_H



/*

 * The m68k can do unaligned accesses itself.

 */

#include <linux/unaligned/access_ok.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#endif /* _ASM_M68K_UNALIGNED_H */

arch/m68k/include/asm/unaligned_no.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
#ifndef _ASM_M68KNOMMU_UNALIGNED_H

#define _ASM_M68KNOMMU_UNALIGNED_H





#ifdef CONFIG_COLDFIRE

#include <linux/unaligned/be_struct.h>

#include <linux/unaligned/le_byteshift.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#else

/*

 * The m68k can do unaligned accesses itself. 

 */

#include <linux/unaligned/access_ok.h>

#include <linux/unaligned/generic.h>



#define get_unaligned	__get_unaligned_be

#define put_unaligned	__put_unaligned_be



#endif



#endif /* _ASM_M68KNOMMU_UNALIGNED_H */