From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932534AbbC2Nly (ORCPT ); Sun, 29 Mar 2015 09:41:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54592 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932517AbbC2Nlu (ORCPT ); Sun, 29 Mar 2015 09:41:50 -0400 Date: Sun, 29 Mar 2015 15:41:22 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: David Woodhouse , Brian Norris , linux-mtd@lists.infradead.org Subject: [PATCH 52/86] mtd/maps: use uapi/linux/pci_ids.h directly Message-ID: <1427635734-24786-53-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 --- drivers/mtd/maps/amd76xrom.c | 2 +- drivers/mtd/maps/ck804xrom.c | 2 +- drivers/mtd/maps/esb2rom.c | 2 +- drivers/mtd/maps/ichxrom.c | 2 +- drivers/mtd/maps/scb2_flash.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c index f7207b0..9024cfa 100644 --- a/drivers/mtd/maps/amd76xrom.c +++ b/drivers/mtd/maps/amd76xrom.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c index 0455166..bf636b4 100644 --- a/drivers/mtd/maps/ck804xrom.c +++ b/drivers/mtd/maps/ck804xrom.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c index f784cf0..80a9e55 100644 --- a/drivers/mtd/maps/esb2rom.c +++ b/drivers/mtd/maps/esb2rom.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #define MOD_NAME KBUILD_BASENAME diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index c7478e1..1da2a52 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #define xstr(s) str(s) diff --git a/drivers/mtd/maps/scb2_flash.c b/drivers/mtd/maps/scb2_flash.c index b7a22a6..8ede345 100644 --- a/drivers/mtd/maps/scb2_flash.c +++ b/drivers/mtd/maps/scb2_flash.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #define MODNAME "scb2_flash" #define SCB2_ADDR 0xfff00000 -- MST