[PATCH 73/86] fbdev/riva: use uapi/linux/pci_ids.h directly
From: "Michael S. Tsirkin" <mst@redhat.com>
Date: 2015-03-29 13:43:04
Also in:
lkml
Subsystem:
framebuffer layer, nvidia (rivafb and nvidiafb) framebuffer driver, the rest · Maintainers:
Helge Deller, Antonino Daplas, Linus Torvalds
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/video/fbdev/riva/nv_driver.c | 2 +- drivers/video/fbdev/riva/riva_hw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/riva/nv_driver.c b/drivers/video/fbdev/riva/nv_driver.c
index f3694cf..f597ee5 100644
--- a/drivers/video/fbdev/riva/nv_driver.c
+++ b/drivers/video/fbdev/riva/nv_driver.c@@ -36,7 +36,7 @@ #include <linux/delay.h> #include <linux/pci.h> -#include <linux/pci_ids.h> +#include <uapi/linux/pci_ids.h> #include "nv_type.h" #include "rivafb.h" #include "nvreg.h"
diff --git a/drivers/video/fbdev/riva/riva_hw.c b/drivers/video/fbdev/riva/riva_hw.c
index 8bdf37f..0d399f6 100644
--- a/drivers/video/fbdev/riva/riva_hw.c
+++ b/drivers/video/fbdev/riva/riva_hw.c@@ -48,7 +48,7 @@ #include <linux/kernel.h> #include <linux/pci.h> -#include <linux/pci_ids.h> +#include <uapi/linux/pci_ids.h> #include "riva_hw.h" #include "riva_tbl.h" #include "nv_type.h"
--
MST