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

Commit 6aeea60a authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

m68k{nommu}: fixups after the header move 



swab.h seems to have been missed during the header merge.
Add conditionals similar to byteorder.h and remove the
now unnecessary byteorder_no/mm.h

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ac3d266b

arch/m68k/include/asm/byteorder.h

+6 −5
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "byteorder_no.h"

#else

#include "byteorder_mm.h"

#endif
 
#ifndef _M68K_BYTEORDER_H

#define _M68K_BYTEORDER_H



#include <linux/byteorder/big_endian.h>



#endif /* _M68K_BYTEORDER_H */

arch/m68k/include/asm/byteorder_mm.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _M68K_BYTEORDER_H

#define _M68K_BYTEORDER_H



#include <linux/byteorder/big_endian.h>



#endif /* _M68K_BYTEORDER_H */

arch/m68k/include/asm/byteorder_no.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_BYTEORDER_H

#define _M68KNOMMU_BYTEORDER_H



#include <linux/byteorder/big_endian.h>



#endif /* _M68KNOMMU_BYTEORDER_H */

arch/m68k/include/asm/swab.h

+5 −0
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "swab_no.h"

#else

#include "swab_mm.h"

#endif