diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 10:22:15 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 10:22:59 +0200 |
commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /arch/m68k/kernel/Makefile_no | |
parent | ath9k_hw: don't touch with treewide double semicolon removal (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecr... (diff) | |
download | linux-07f9479a40cc778bc1462ada11f95b01360ae4ff.tar.xz linux-07f9479a40cc778bc1462ada11f95b01360ae4ff.zip |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'arch/m68k/kernel/Makefile_no')
-rw-r--r-- | arch/m68k/kernel/Makefile_no | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/m68k/kernel/Makefile_no b/arch/m68k/kernel/Makefile_no new file mode 100644 index 000000000000..37c3fc074c0a --- /dev/null +++ b/arch/m68k/kernel/Makefile_no @@ -0,0 +1,10 @@ +# +# Makefile for arch/m68knommu/kernel. +# + +extra-y := vmlinux.lds + +obj-y += dma.o entry.o init_task.o irq.o m68k_ksyms.o process.o ptrace.o \ + setup.o signal.o syscalltable.o sys_m68k.o time.o traps.o + +obj-$(CONFIG_MODULES) += module.o |