lkml.org 
[lkml]   [2015]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 52/86] mtd/maps: use uapi/linux/pci_ids.h directly
    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/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 <linux/mtd/cfi.h>
    #include <linux/mtd/flashchip.h>
    #include <linux/pci.h>
    -#include <linux/pci_ids.h>
    +#include <uapi/linux/pci_ids.h>
    #include <linux/list.h>


    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 <linux/mtd/cfi.h>
    #include <linux/mtd/flashchip.h>
    #include <linux/pci.h>
    -#include <linux/pci_ids.h>
    +#include <uapi/linux/pci_ids.h>
    #include <linux/list.h>


    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 <linux/mtd/cfi.h>
    #include <linux/mtd/flashchip.h>
    #include <linux/pci.h>
    -#include <linux/pci_ids.h>
    +#include <uapi/linux/pci_ids.h>
    #include <linux/list.h>

    #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 <linux/mtd/cfi.h>
    #include <linux/mtd/flashchip.h>
    #include <linux/pci.h>
    -#include <linux/pci_ids.h>
    +#include <uapi/linux/pci_ids.h>
    #include <linux/list.h>

    #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 <linux/mtd/map.h>
    #include <linux/mtd/cfi.h>
    #include <linux/pci.h>
    -#include <linux/pci_ids.h>
    +#include <uapi/linux/pci_ids.h>

    #define MODNAME "scb2_flash"
    #define SCB2_ADDR 0xfff00000
    --
    MST


    \
     
     \ /
      Last update: 2015-03-29 16:21    [W:5.889 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site