From patchwork Fri Jul 16 14:20:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 112445 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6GEMwaY024753 for ; Fri, 16 Jul 2010 14:26:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965678Ab0GPO0o (ORCPT ); Fri, 16 Jul 2010 10:26:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62832 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965676Ab0GPO0o (ORCPT ); Fri, 16 Jul 2010 10:26:44 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o6GEQA1e026009 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 16 Jul 2010 10:26:10 -0400 Received: from redhat.com (vpn1-5-95.ams2.redhat.com [10.36.5.95]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o6GEQ5CE032396; Fri, 16 Jul 2010 10:26:06 -0400 Date: Fri, 16 Jul 2010 17:20:50 +0300 From: "Michael S. Tsirkin" To: Jesse Barnes , vgoyal@redhat.com, "David S. Miller" , "Rafael J. Wysocki" , seto.hidetoshi@jp.fujitsu.com, Matt Carlson , Michael Chan , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH repost] pci: fix compilation when CONFIG_PCI_MSI=n Message-ID: <20100716142050.GA4970@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 16 Jul 2010 14:26:49 +0000 (UTC) diff --git a/include/linux/pci.h b/include/linux/pci.h index 31d8a12..7cb0084 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -780,11 +780,7 @@ int __must_check pci_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); void pci_intx(struct pci_dev *dev, int enable); -#ifdef CONFIG_PCI_MSI void pci_msi_off(struct pci_dev *dev); -#else -static inline void pci_msi_off(struct pci_dev *dev) {} -#endif int pci_set_dma_max_seg_size(struct pci_dev *dev, unsigned int size); int pci_set_dma_seg_boundary(struct pci_dev *dev, unsigned long mask); int pcix_get_max_mmrbc(struct pci_dev *dev);