From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753640AbbC2Nro (ORCPT ); Sun, 29 Mar 2015 09:47:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58205 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752797AbbC2Nmz (ORCPT ); Sun, 29 Mar 2015 09:42:55 -0400 Date: Sun, 29 Mar 2015 15:42:43 +0200 From: "Michael S. Tsirkin" To: linux-kernel@vger.kernel.org Cc: Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Bjorn Helgaas , Laurent Pinchart , Benoit Taine , linux-fbdev@vger.kernel.org Subject: [PATCH 71/86] fbdev/i740fb: use uapi/linux/pci_ids.h directly Message-ID: <1427635734-24786-72-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/video/fbdev/i740fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c index a2b4204..abad615 100644 --- a/drivers/video/fbdev/i740fb.c +++ b/drivers/video/fbdev/i740fb.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include -- MST From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Date: Sun, 29 Mar 2015 13:42:43 +0000 Subject: [PATCH 71/86] fbdev/i740fb: use uapi/linux/pci_ids.h directly Message-Id: <1427635734-24786-72-git-send-email-mst@redhat.com> List-Id: References: <1427635734-24786-1-git-send-email-mst@redhat.com> In-Reply-To: <1427635734-24786-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Bjorn Helgaas , Laurent Pinchart , Benoit Taine , linux-fbdev@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/video/fbdev/i740fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c index a2b4204..abad615 100644 --- a/drivers/video/fbdev/i740fb.c +++ b/drivers/video/fbdev/i740fb.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include -- MST