| Message ID | 1427635734-24786-41-git-send-email-mst@redhat.com |
|---|---|
| State | Rejected |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 3/29/2015 4:40 PM, Michael S. Tsirkin wrote: > 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/ide/ide-generic.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c > index 54d7c46..4edb39f 100644 > --- a/drivers/ide/ide-generic.c > +++ b/drivers/ide/ide-generic.c > @@ -11,7 +11,7 @@ > #include <linux/init.h> > #include <linux/module.h> > #include <linux/ide.h> > -#include <linux/pci_ids.h> > +#include <uapi/linux/pci_ids.h> Hm, I thought include/uapi/ was always in #include file search path, so there should be no need to explicitly mention it, and so no need for this patch... WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Mar 29, 2015 at 05:12:45PM +0300, Sergei Shtylyov wrote: > Hello. > > On 3/29/2015 4:40 PM, Michael S. Tsirkin wrote: > > >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/ide/ide-generic.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > >diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c > >index 54d7c46..4edb39f 100644 > >--- a/drivers/ide/ide-generic.c > >+++ b/drivers/ide/ide-generic.c > >@@ -11,7 +11,7 @@ > > #include <linux/init.h> > > #include <linux/module.h> > > #include <linux/ide.h> > >-#include <linux/pci_ids.h> > >+#include <uapi/linux/pci_ids.h> > > Hm, I thought include/uapi/ was always in #include file search path, so > there should be no need to explicitly mention it, and so no need for this > patch... > > WBR, Sergei There's some confusion about whether headers should be preferably included using #include <uapi/linux/...> or #include <linux/...>. It might be a good idea to document this somewhere.
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 54d7c46..4edb39f 100644 --- a/drivers/ide/ide-generic.c +++ b/drivers/ide/ide-generic.c @@ -11,7 +11,7 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/ide.h> -#include <linux/pci_ids.h> +#include <uapi/linux/pci_ids.h> /* FIXME: convert arm and m32r to use ide_platform host driver */ #ifdef CONFIG_ARM
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/ide/ide-generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)