From: Rusty Russell <rusty@rustcorp.com.au>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH] pci: fix compilation when CONFIG_PCI_MSI=n
Date: Wed, 16 Jun 2010 14:21:10 +0930 [thread overview]
Message-ID: <201006161421.11148.rusty@rustcorp.com.au> (raw)
drivers/pci/pci.c:2277: error: redefinition of ‘pci_msi_off’
include/linux/pci.h:786: note: previous definition of ‘pci_msi_off’ was here
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---
drivers/pci/pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2266,6 +2266,7 @@ pci_intx(struct pci_dev *pdev, int enabl
}
}
+#ifdef CONFIG_PCI_MSI
/**
* pci_msi_off - disables any msi or msix capabilities
* @dev: the PCI device to operate on
@@ -2293,6 +2294,7 @@ void pci_msi_off(struct pci_dev *dev)
}
}
EXPORT_SYMBOL_GPL(pci_msi_off);
+#endif
#ifndef HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_SIZE
int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size)
next reply other threads:[~2010-06-16 4:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-16 4:51 Rusty Russell [this message]
2010-06-16 6:09 ` [PATCH] pci: fix compilation when CONFIG_PCI_MSI=n Hidetoshi Seto
2010-06-16 8:22 ` Michael S. Tsirkin
2010-06-18 16:42 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201006161421.11148.rusty@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox