Commit ac3d266b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -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

include/asm-m68k/Kbuild→arch/m68k/include/asm/Kbuild

+0 −0

File moved.

View file