From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752847AbbC2Nhy (ORCPT ); Sun, 29 Mar 2015 09:37:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41724 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752458AbbC2Nht (ORCPT ); Sun, 29 Mar 2015 09:37:49 -0400 Date: Sun, 29 Mar 2015 15:37:43 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , linuxppc-dev@lists.ozlabs.org Subject: [PATCH 04/86] powerpc/pci: use uapi/linux/pci_ids.h directly Message-ID: <1427635734-24786-5-git-send-email-mst@redhat.com> References: <1427635734-24786-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1427635734-24786-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Header moved from linux/pci_ids.h to uapi/linux/pci_ids.h, use the new header directly so we can drop the wrapper in include/linux/pci_ids.h. Signed-off-by: Michael S. Tsirkin --- arch/powerpc/platforms/embedded6xx/mpc10x.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/embedded6xx/mpc10x.h b/arch/powerpc/platforms/embedded6xx/mpc10x.h index b290b63..4175800 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc10x.h +++ b/arch/powerpc/platforms/embedded6xx/mpc10x.h @@ -13,7 +13,7 @@ #ifndef __PPC_KERNEL_MPC10X_H #define __PPC_KERNEL_MPC10X_H -#include +#include #include /* @@ -35,7 +35,7 @@ /* * Define the vendor/device IDs for the various bridges--should be added to - * + * */ #define MPC10X_BRIDGE_106 ((PCI_DEVICE_ID_MOTOROLA_MPC106 << 16) | \ PCI_VENDOR_ID_MOTOROLA) -- MST