Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k,m68knommu: merge header files

Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

diff --combined Makefile
index 207303da3971b3b6e354d2ace13fedc665f2a651,bab7b8485f1cf4866dac531bab8ed1b6ab259320..93b81bc10e1324a95dc1b0be5b2774660e5e7819
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 29
 -EXTRAVERSION = -rc1
 +EXTRAVERSION = -rc2
  NAME = Erotic Pickled Herring
  
  # *DOCUMENTATION*
@@@ -213,6 -213,10 +213,10 @@@ endi
  # Where to locate arch specific headers
  hdr-arch  := $(SRCARCH)
  
+ ifeq ($(ARCH),m68knommu)
+        hdr-arch  := m68k
+ endif
+ 
  KCONFIG_CONFIG        ?= .config
  
  # SHELL used by kbuild

diff --combined arch/m68k/include/asm/Kbuild
index 1a922fad76f753aa66e8d212828935861892865a,52fd96b4142a47b1541a7d9a5f6549581d6c8377..1a922fad76f753aa66e8d212828935861892865a
--- 1/include/asm-m68k/Kbuild
--- 2/arch/m68k/include/asm/Kbuild
+++ b/arch/m68k/include/asm/Kbuild
@@@ -1,2 -1,3 +1,2 @@@
  include include/asm-generic/Kbuild.asm
  header-y += cachectl.h
 -unifdef-y += swab.h

diff --combined arch/m68k/include/asm/byteorder_mm.h
index 31b260a88803b97afecd337a9bbe509f48f2d51e,300866523b8622062bbb42839762c7c9fd7457d7..31b260a88803b97afecd337a9bbe509f48f2d51e
--- 1/include/asm-m68k/byteorder.h
--- 2/arch/m68k/include/asm/byteorder_mm.h
+++ b/arch/m68k/include/asm/byteorder_mm.h
@@@ -1,6 -1,7 +1,6 @@@
  #ifndef _M68K_BYTEORDER_H
  #define _M68K_BYTEORDER_H
  
 -#include <asm/swab.h>
  #include <linux/byteorder/big_endian.h>
  
  #endif /* _M68K_BYTEORDER_H */

diff --combined arch/m68k/include/asm/byteorder_no.h
index 9c6c76a1504177e49a8676f811bed2e9a9e69a1b,a6f0b8f7f6227d63e3a21700e17fd08e090ffe14..9c6c76a1504177e49a8676f811bed2e9a9e69a1b
--- 1/arch/m68knommu/include/asm/byteorder.h
--- 2/arch/m68k/include/asm/byteorder_no.h
+++ b/arch/m68k/include/asm/byteorder_no.h
@@@ -1,6 -1,7 +1,6 @@@
  #ifndef _M68KNOMMU_BYTEORDER_H
  #define _M68KNOMMU_BYTEORDER_H
  
 -#include <asm/swab.h>
  #include <linux/byteorder/big_endian.h>
  
  #endif /* _M68KNOMMU_BYTEORDER_H */

diff --combined arch/m68k/include/asm/unistd_mm.h
index 3c19027331faa0cc9d1ec9a6195096a112434a2a,965abb8bc7ff7297d565ad1d2c710acb05373baa..3c19027331faa0cc9d1ec9a6195096a112434a2a
--- 1/include/asm-m68k/unistd.h
--- 2/arch/m68k/include/asm/unistd_mm.h
+++ b/arch/m68k/include/asm/unistd_mm.h
@@@ -5,7 -5,6 +5,7 @@@
   * This file contains the system call numbers.
   */
  
 +#define __NR_restart_syscall    0
  #define __NR_exit               1
  #define __NR_fork               2
  #define __NR_read               3
@@@ -360,6 -359,9 +360,6 @@@
  #define __ARCH_WANT_SYS_SIGPROCMASK
  #define __ARCH_WANT_SYS_RT_SIGACTION
  
 -/* whitelist for checksyscalls */
 -#define __IGNORE_restart_syscall
 -
  /*
   * "Conditional" syscalls
   *