diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 17:56:41 -0400 |
| commit | 4dd565134ece7e5d528d4c5288879310c54419e9 (patch) | |
| tree | e08910d2d0feae0c030f8f01acc9b03eb760ad9a /arch/mips/sibyte/swarm/Makefile | |
| parent | 071d7ab6649eb34a873a53e71635186e9117101d (diff) | |
| parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/e1000e/ich8lan.c
drivers/net/e1000e/netdev.c
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 f18ba9201bbc..7b45f199d92a 100644 --- a/arch/mips/sibyte/swarm/Makefile +++ b/arch/mips/sibyte/swarm/Makefile | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | obj-y := setup.o rtc_xicor1241.o rtc_m41t81.o | 1 | obj-y := platform.o setup.o rtc_xicor1241.o \ |
| 2 | rtc_m41t81.o | ||
| 2 | 3 | ||
| 3 | obj-$(CONFIG_I2C_BOARDINFO) += swarm-i2c.o | 4 | obj-$(CONFIG_I2C_BOARDINFO) += swarm-i2c.o |