diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-06 14:27:57 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-06 14:27:57 -0700 |
commit | f1ea7254726d25a333056619ec6b1a8ee1b7358d (patch) | |
tree | ad0a6307890595172406fda45ec763f7a6bb8686 /arch/mips/sibyte/swarm/Makefile | |
parent | ba9b0c11285bcdaa3243c4123e924094b626c740 (diff) | |
parent | ca09a237b8c6b053e101a4a83bc30d2c48435bd5 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: workaround for bogus gcc warning in ide_sysfs_register_port()
ide-cd: Optiarc DVD RW AD-7200A does play audio
IDE: Fix platform device registration in Swarm IDE driver (v2)
ide-dma: fix ide_build_dmatable() for TRM290
ide-cd: temporary tray close fix
Diffstat (limited to 'arch/mips/sibyte/swarm/Makefile')
-rw-r--r-- | arch/mips/sibyte/swarm/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/sibyte/swarm/Makefile b/arch/mips/sibyte/swarm/Makefile index f18ba9201bb..7b45f199d92 100644 --- a/arch/mips/sibyte/swarm/Makefile +++ b/arch/mips/sibyte/swarm/Makefile @@ -1,3 +1,4 @@ -obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o +obj-y := platform.o setup.o rtc_xicor1241.o \ + rtc_m41t81.o obj-$(CONFIG_I2C_BOARDINFO) += swarm-i2c.o |