diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-04 17:12:34 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-04 17:12:34 -0500 |
commit | c00c0dc6875be609072434bd0aaf516270e33d4a (patch) | |
tree | 299327dc3f511194859bfedefa8438fa5d22e61d /Makefile.objs | |
parent | 5df0a2a5ba54114afb2bf75cab9fb184020a46a8 (diff) | |
parent | 1ab74cea060d776b19857c3babc64d729bbdba5c (diff) |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
Diffstat (limited to 'Makefile.objs')
-rw-r--r-- | Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index b6bcfcc169..432b6198e9 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -163,7 +163,7 @@ common-obj-y += qemu-timer.o qemu-timer-common.o slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o -slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o +slirp-obj-y += tcp_subr.o tcp_timer.o udp.o bootp.o tftp.o arp_table.o common-obj-$(CONFIG_SLIRP) += $(addprefix slirp/, $(slirp-obj-y)) # xen backend driver support |