On Sun, Mar 29, 2015 at 03:41:54PM +0200, 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@xxxxxxxxxx> This isn't in mainline yet, so I presume whoever is pushing the move to next will pick this up as well and keep it all together. Acked-by: Darren Hart <dvhart@xxxxxxxxxxxxxxx> > --- > drivers/platform/x86/thinkpad_acpi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c > index 3b8ceee..f1ac982 100644 > --- a/drivers/platform/x86/thinkpad_acpi.c > +++ b/drivers/platform/x86/thinkpad_acpi.c > @@ -77,7 +77,7 @@ > #include <linux/jiffies.h> > #include <linux/workqueue.h> > #include <linux/acpi.h> > -#include <linux/pci_ids.h> > +#include <uapi/linux/pci_ids.h> > #include <linux/thinkpad_acpi.h> > #include <sound/core.h> > #include <sound/control.h> > -- > MST > > -- Darren Hart Intel Open Source Technology Center ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ ibm-acpi-devel mailing list ibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel