From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com>,
Hans Verkuil <hans.verkuil@cisco.com>,
linux-media@vger.kernel.org
Subject: [PATCH 45/86] media/ngene: use uapi/linux/pci_ids.h directly
Date: Sun, 29 Mar 2015 15:41:02 +0200 [thread overview]
Message-ID: <1427635734-24786-46-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1427635734-24786-1-git-send-email-mst@redhat.com>
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/media/pci/ngene/ngene-cards.c | 2 +-
drivers/media/pci/ngene/ngene-i2c.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c
index 039bed3..f381bab 100644
--- a/drivers/media/pci/ngene/ngene-cards.c
+++ b/drivers/media/pci/ngene/ngene-cards.c
@@ -30,7 +30,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 "ngene.h"
diff --git a/drivers/media/pci/ngene/ngene-i2c.c b/drivers/media/pci/ngene/ngene-i2c.c
index d28554f..06846d3 100644
--- a/drivers/media/pci/ngene/ngene-i2c.c
+++ b/drivers/media/pci/ngene/ngene-i2c.c
@@ -36,7 +36,7 @@
#include <linux/io.h>
#include <asm/div64.h>
#include <linux/pci.h>
-#include <linux/pci_ids.h>
+#include <uapi/linux/pci_ids.h>
#include <linux/timer.h>
#include <linux/byteorder/generic.h>
#include <linux/firmware.h>
--
MST
next prev parent reply other threads:[~2015-03-29 13:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1427635734-24786-1-git-send-email-mst@redhat.com>
2015-03-29 13:40 ` [PATCH 44/86] media/ddbridge: use uapi/linux/pci_ids.h directly Michael S. Tsirkin
2015-03-29 13:41 ` Michael S. Tsirkin [this message]
2015-03-29 13:41 ` [PATCH 46/86] media/fintek: " Michael S. Tsirkin
2015-03-29 13:41 ` [PATCH 47/86] media/ite: " Michael S. Tsirkin
2015-03-29 13:41 ` [PATCH 48/86] media/nuvoton: " Michael S. Tsirkin
2015-03-29 13:41 ` [PATCH 49/86] media/winbond: " Michael S. Tsirkin
2015-03-29 13:43 ` [PATCH 82/86] media/fintek: drop pci_ids dependency Michael S. Tsirkin
2015-03-29 15:40 ` Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427635734-24786-46-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=hans.verkuil@cisco.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@osg.samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).