diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:56:24 +0100 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-13 06:56:24 +0100 |
commit | cbe56159a3e60624b5f44cf48b640fa470436e34 (patch) | |
tree | f3dd43243be6e840dc2b0386e91c4146a4f51620 /arch/m68k/kernel/Makefile | |
parent | Merge branch 'master' into 83xx (diff) | |
parent | [POWERPC] spufs: Fix bitrot of the SPU mmap facility (diff) | |
download | linux-cbe56159a3e60624b5f44cf48b640fa470436e34.tar.xz linux-cbe56159a3e60624b5f44cf48b640fa470436e34.zip |
Merge branch 'master' into 83xx
Diffstat (limited to 'arch/m68k/kernel/Makefile')
-rw-r--r-- | arch/m68k/kernel/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/kernel/Makefile b/arch/m68k/kernel/Makefile index 1c9ecaa473d5..0b68ab8d63d1 100644 --- a/arch/m68k/kernel/Makefile +++ b/arch/m68k/kernel/Makefile @@ -10,7 +10,9 @@ endif extra-y += vmlinux.lds obj-y := entry.o process.o traps.o ints.o signal.o ptrace.o \ - sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o + sys_m68k.o time.o semaphore.o setup.o m68k_ksyms.o devres.o + +devres-y = ../../../kernel/irq/devres.o obj-$(CONFIG_PCI) += bios32.o obj-$(CONFIG_MODULES) += module.o |