diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-20 17:50:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:38:43 -0800 |
| commit | 6aeea60aee945449c93d9aa70638deeb5c4c5439 (patch) | |
| tree | 232b3cf562646515e2a4ada2f28ed919d7cc5aa7 /arch | |
| parent | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (diff) | |
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: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/byteorder.h | 11 | ||||
| -rw-r--r-- | arch/m68k/include/asm/byteorder_mm.h | 6 | ||||
| -rw-r--r-- | arch/m68k/include/asm/byteorder_no.h | 6 | ||||
| -rw-r--r-- | arch/m68k/include/asm/swab.h | 5 |
4 files changed, 11 insertions, 17 deletions
diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h index f20502a001f..31b260a8880 100644 --- a/arch/m68k/include/asm/byteorder.h +++ b/arch/m68k/include/asm/byteorder.h @@ -1,5 +1,6 @@ -#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 */ diff --git a/arch/m68k/include/asm/byteorder_mm.h b/arch/m68k/include/asm/byteorder_mm.h deleted file mode 100644 index 31b260a8880..00000000000 --- a/arch/m68k/include/asm/byteorder_mm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68K_BYTEORDER_H -#define _M68K_BYTEORDER_H - -#include <linux/byteorder/big_endian.h> - -#endif /* _M68K_BYTEORDER_H */ diff --git a/arch/m68k/include/asm/byteorder_no.h b/arch/m68k/include/asm/byteorder_no.h deleted file mode 100644 index 9c6c76a1504..00000000000 --- a/arch/m68k/include/asm/byteorder_no.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_BYTEORDER_H -#define _M68KNOMMU_BYTEORDER_H - -#include <linux/byteorder/big_endian.h> - -#endif /* _M68KNOMMU_BYTEORDER_H */ diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h index e69de29bb2d..7d7dde1c73e 100644 --- a/arch/m68k/include/asm/swab.h +++ b/arch/m68k/include/asm/swab.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "swab_no.h" +#else +#include "swab_mm.h" +#endif |