summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/xen.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-20 03:35:12 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-20 03:35:12 +0100
commitfa2c8f401797eee814b7b9fa0b23fa6c4c3f5533 (patch)
tree826fb23071b866e112d6e9c510fe3ad4d668acdc /arch/x86/pci/xen.c
parentASoC: Add __devinit annotation for pxa2xx_ac97_probe (diff)
parentLinux 3.3-rc4 (diff)
downloadlinux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.tar.xz
linux-fa2c8f401797eee814b7b9fa0b23fa6c4c3f5533.zip
Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the dmaeengine conversion that depends on this resolution. Linux 3.3-rc4 Conflicts: sound/soc/sh/fsi.c
Diffstat (limited to 'arch/x86/pci/xen.c')
-rw-r--r--arch/x86/pci/xen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 492ade8c978e..d99346ea8fdb 100644
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -374,7 +374,7 @@ int __init pci_xen_init(void)
int __init pci_xen_hvm_init(void)
{
- if (!xen_feature(XENFEAT_hvm_pirqs))
+ if (!xen_have_vector_callback || !xen_feature(XENFEAT_hvm_pirqs))
return 0;
#ifdef CONFIG_ACPI