diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-24 18:54:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-24 18:54:17 -0400 |
| commit | 9539ce2253ab1b054e9b0daf0abe0fd4263e1820 (patch) | |
| tree | 3d499436eef8fb5f9bceb668eb8338a0f135308c /arch/mips/sgi-ip32/Makefile | |
| parent | c2b38989cf2b0c003a9cf57efc833ab16d33901e (diff) | |
| parent | 096a458c3a9c717563e98b0a2ce69821459a6660 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
forcedeth: fix cpu irq mask
chelsio parenthesis fix
spidernet: skb used after netif_receive_skb
meth driver renovation
remove unnecessary dependency on VIA velocity config
fix compiler warning in fixed.c
asix.c - Add Belkin F5D5055 ids
ucc_geth:trivial fix
ucc_geth: Fix MODULE_DEVICE_TABLE() duplication
[PATCH] drivers/net/wireless/libertas/rx.c: fix use-after-free
[PATCH] drivers/net/wireless/libertas/fw.c: fix use-before-check
[PATCH] libertas: skb dereferenced after netif_rx
Diffstat (limited to 'arch/mips/sgi-ip32/Makefile')
| -rw-r--r-- | arch/mips/sgi-ip32/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/sgi-ip32/Makefile b/arch/mips/sgi-ip32/Makefile index 7e1416768a60..60f0227425e7 100644 --- a/arch/mips/sgi-ip32/Makefile +++ b/arch/mips/sgi-ip32/Makefile | |||
| @@ -3,5 +3,5 @@ | |||
| 3 | # under Linux. | 3 | # under Linux. |
| 4 | # | 4 | # |
| 5 | 5 | ||
| 6 | obj-y += ip32-berr.o ip32-irq.o ip32-setup.o ip32-reset.o \ | 6 | obj-y += ip32-berr.o ip32-irq.o ip32-platform.o ip32-setup.o ip32-reset.o \ |
| 7 | crime.o ip32-memory.o | 7 | crime.o ip32-memory.o |