From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932203AbbC2Njb (ORCPT <rfc822;w@1wt.eu>);
	Sun, 29 Mar 2015 09:39:31 -0400
Received: from mx1.redhat.com ([209.132.183.28]:58068 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932185AbbC2Nj1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sun, 29 Mar 2015 09:39:27 -0400
Date: Sun, 29 Mar 2015 15:39:05 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Doug Thompson <dougthompson@xmission.com>, Borislav Petkov <bp@alien8.de>,
        Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
        linux-edac@vger.kernel.org
Subject: [PATCH 18/86] edac/amd: use uapi/linux/pci_ids.h directly
Message-ID: <1427635734-24786-19-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: <linux-kernel.vger.kernel.org>
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 <mst@redhat.com>
---
 drivers/edac/amd64_edac.h   | 2 +-
 drivers/edac/amd76x_edac.c  | 2 +-
 drivers/edac/amd8111_edac.c | 2 +-
 drivers/edac/amd8131_edac.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/edac/amd64_edac.h b/drivers/edac/amd64_edac.h
index d8468c6..475b0f3 100644
--- a/drivers/edac/amd64_edac.h
+++ b/drivers/edac/amd64_edac.h
@@ -66,7 +66,7 @@
 #include <linux/ctype.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
 #include <linux/slab.h>
 #include <linux/mmzone.h>
 #include <linux/edac.h>
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
index 3a501b5..57cbae8 100644
--- a/drivers/edac/amd76x_edac.c
+++ b/drivers/edac/amd76x_edac.c
@@ -15,7 +15,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
 #include <linux/edac.h>
 #include "edac_core.h"
 
diff --git a/drivers/edac/amd8111_edac.c b/drivers/edac/amd8111_edac.c
index 2b63f7c..a7fe004 100644
--- a/drivers/edac/amd8111_edac.c
+++ b/drivers/edac/amd8111_edac.c
@@ -26,7 +26,7 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/edac.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
 #include <asm/io.h>
 
 #include "edac_core.h"
diff --git a/drivers/edac/amd8131_edac.c b/drivers/edac/amd8131_edac.c
index a5c6805..e971a20 100644
--- a/drivers/edac/amd8131_edac.c
+++ b/drivers/edac/amd8131_edac.c
@@ -27,7 +27,7 @@
 #include <linux/io.h>
 #include <linux/bitops.h>
 #include <linux/edac.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
 
 #include "edac_core.h"
 #include "edac_module.h"
-- 
MST