Commit ac3d266b authored by Linus Torvalds's avatar Linus Torvalds

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
parents 9f4863b7 49148020
......@@ -213,6 +213,10 @@ endif
# Where to locate arch specific headers
hdr-arch := $(SRCARCH)
ifeq ($(ARCH),m68knommu)
hdr-arch := m68k
endif
KCONFIG_CONFIG ?= .config
# SHELL used by kbuild
......
#ifdef __uClinux__
#include "atomic_no.h"
#else
#include "atomic_mm.h"
#endif
#ifdef __uClinux__
#include "bitops_no.h"
#else
#include "bitops_mm.h"
#endif
#ifdef __uClinux__
#include "bootinfo_no.h"
#else
#include "bootinfo_mm.h"
#endif
#ifdef __uClinux__
#include "bug_no.h"
#else
#include "bug_mm.h"
#endif
#ifdef __uClinux__
#include "bugs_no.h"
#else
#include "bugs_mm.h"
#endif
#ifdef __uClinux__
#include "byteorder_no.h"
#else
#include "byteorder_mm.h"
#endif
#ifdef __uClinux__
#include "cache_no.h"
#else
#include "cache_mm.h"
#endif
#ifdef __uClinux__
#include "cacheflush_no.h"
#else
#include "cacheflush_mm.h"
#endif
#ifdef __uClinux__
#include "checksum_no.h"
#else
#include "checksum_mm.h"
#endif
#ifdef __uClinux__
#include "current_no.h"
#else
#include "current_mm.h"
#endif
#ifdef __uClinux__
#include "delay_no.h"
#else
#include "delay_mm.h"
#endif
#ifdef __uClinux__
#include "div64_no.h"
#else
#include "div64_mm.h"
#endif
#ifdef __uClinux__
#include "dma-mapping_no.h"
#else
#include "dma-mapping_mm.h"
#endif
#ifdef __uClinux__
#include "dma_no.h"
#else
#include "dma_mm.h"
#endif
#ifdef __uClinux__
#include "elf_no.h"
#else
#include "elf_mm.h"
#endif
#ifdef __uClinux__
#include "entry_no.h"
#else
#include "entry_mm.h"
#endif
#ifdef __uClinux__
#include "fb_no.h"
#else
#include "fb_mm.h"
#endif
#ifdef __uClinux__
#include "fpu_no.h"
#else
#include "fpu_mm.h"
#endif
#ifdef __uClinux__
#include "hardirq_no.h"
#else
#include "hardirq_mm.h"
#endif
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.