diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-17 13:54:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-17 13:54:29 -0700 |
| commit | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (patch) | |
| tree | ebcc8e9b0f395033e8ba1db8e30fb6ea78edc442 /arch/m68k/amiga/Makefile | |
| parent | 7d32c0aca4fbd0319c860d12af5fae3e88c760e6 (diff) | |
| parent | 92183b346f02773dae09182c65f16b013f295d80 (diff) | |
| download | kernel_samsung_aries-ba2e1c5f25a99dec3873745031ad23ce3fd79bff.zip kernel_samsung_aries-ba2e1c5f25a99dec3873745031ad23ce3fd79bff.tar.gz kernel_samsung_aries-ba2e1c5f25a99dec3873745031ad23ce3fd79bff.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: amiga - Floppy platform device conversion
m68k: amiga - Sound platform device conversion
m68k: amiga - Frame buffer platform device conversion
m68k: amiga - Zorro host bridge platform device conversion
m68k: amiga - Zorro bus modalias support
platform: Make platform resource input parameters const
m68k: invoke oom-killer from page fault
serial167: Kill unused variables
m68k: Implement generic_find_next_{zero_,}le_bit()
m68k: hp300 - Checkpatch cleanup
m68k: Remove trailing spaces in messages
m68k: Simplify param.h by using <asm-generic/param.h>
m68k: Remove BKL from rtc implementations
Diffstat (limited to 'arch/m68k/amiga/Makefile')
| -rw-r--r-- | arch/m68k/amiga/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/amiga/Makefile b/arch/m68k/amiga/Makefile index 6a0d765..11dd30b 100644 --- a/arch/m68k/amiga/Makefile +++ b/arch/m68k/amiga/Makefile @@ -2,6 +2,6 @@ # Makefile for Linux arch/m68k/amiga source directory # -obj-y := config.o amiints.o cia.o chipram.o amisound.o +obj-y := config.o amiints.o cia.o chipram.o amisound.o platform.o obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o |