Patchwork [1/3] virtio-9p: Move 9p device registration into virtio-9p.c

login
register
mail settings
Submitter Aneesh Kumar K.V
Date June 1, 2011, 6:49 a.m.
Message ID <87pqmycag8.fsf@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/98130/
State New
Headers show

Comments

Aneesh Kumar K.V - June 1, 2011, 6:49 a.m.
On Tue, 31 May 2011 14:28:19 -0700, Venkateswararao Jujjuri <jvrao@linux.vnet.ibm.com> wrote:
> On 04/27/2011 04:46 AM, Aneesh Kumar K.V wrote:
> > This patch move the 9p device registration into its own file
> 
> All other PCI devices registration is in this file. Not sure the need to 
> move 9p alone.
> Also s390x doesn't support PCI..hence this breaks the s390x build.
> 

s390 got added recently i guess, so my build didn't catch this. Fixed by
the below diff. 

-aneesh

Patch

diff --git a/Makefile.objs b/Makefile.objs
index 0668e0a..2d514a7 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -45,7 +45,7 @@  net-nested-$(CONFIG_SLIRP) += slirp.o
 net-nested-$(CONFIG_VDE) += vde.o
 net-obj-y += $(addprefix net/, $(net-nested-y))
 
-ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy)
+ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
 # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
 # only pull in the actual virtio-9p device