diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:33:01 -0800 |
| commit | ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132 (patch) | |
| tree | d498e947176f4b77938034ff6c6427f9875da721 /Makefile | |
| parent | 9f4863b7dc7f545bb3a01746feafdc1208e86c89 (diff) | |
| parent | 49148020bcb6910ce71417bd990a5ce7017f9bd3 (diff) | |
| download | kernel_samsung_smdk4412-ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132.tar.gz kernel_samsung_smdk4412-ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132.tar.bz2 kernel_samsung_smdk4412-ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132.zip | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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 |