Commit 13748cf4 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

parents 99cce9fa 7665385a

Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ user-obj-y += cutils.o cache-utils.o 
hw-obj-y =

hw-obj-y += vl.o loader.o

hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o

hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o

hw-obj-y += fw_cfg.o

hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o

hw-obj-$(CONFIG_PCI) += msix.o msi.o

Makefile.target

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o 
# need to fix this properly

obj-$(CONFIG_NO_PCI) += pci-stub.o

obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o

obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o

obj-y += vhost_net.o

obj-$(CONFIG_VHOST_NET) += vhost.o

obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o

audio/audio_pt_int.c

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
#include "audio_int.h"

#include "audio_pt_int.h"



#include <signal.h>



static void GCC_FMT_ATTR(3, 4) logerr (struct audio_pt *pt, int err,

                                       const char *fmt, ...)

{

audio/sdlaudio.c

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)

#include <pthread.h>

#endif

#include <signal.h>

#endif



#define AUDIO_CAP "sdl"

block/raw-posix.c

+0 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 


#ifdef __sun__

#define _POSIX_PTHREAD_SEMANTICS 1

#include <signal.h>

#include <sys/dkio.h>

#endif

#ifdef __linux__
@@ -53,7 +52,6 @@ 
#include <linux/fd.h>

#endif

#if defined (__FreeBSD__) || defined(__FreeBSD_kernel__)

#include <signal.h>

#include <sys/disk.h>

#include <sys/cdio.h>

#endif