diff options
| author |   Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 07:53:34 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-05-13 07:53:34 +0900 |
| commit | 163ec0369be4c26e68385f6cec88d0ee38c8d8e5 (patch) | |
| tree | f3e441866f8bc1b0548e7d8eddd9548b6aedef5e /drivers/net/xen-netfront.c | |
| parent | ARM: SAMSUNG: merge plat-s5p into plat-samsung (diff) | |
| parent | ARM: S3C24XX: Use common macro to define resources on dev-uart.c (diff) | |
| download | linux-dev-163ec0369be4c26e68385f6cec88d0ee38c8d8e5.tar.xz linux-dev-163ec0369be4c26e68385f6cec88d0ee38c8d8e5.zip | |
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
Diffstat (limited to 'drivers/net/xen-netfront.c')
| -rw-r--r-- | drivers/net/xen-netfront.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 663b32c2e931..0ebbb1906c30 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1965,7 +1965,7 @@ static int __init netif_init(void) if (xen_initial_domain()) return 0; - if (!xen_platform_pci_unplug) + if (xen_hvm_domain() && !xen_platform_pci_unplug) return -ENODEV; printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); |