RE: [PATCH 62/86] staging/comedi: use uapi/linux/pci_ids.h directly

[Hartley Sweeten]

On Sunday, March 29, 2015 10:35 AM, Ian Abbott wrote:
> On 29/03/15 14:42, 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>
>> ---
>>   drivers/staging/comedi/comedidev.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
>> index e138eb0..1c3ac0b 100644
>> --- a/drivers/staging/comedi/comedidev.h
>> +++ b/drivers/staging/comedi/comedidev.h
>> @@ -556,7 +556,7 @@ void comedi_driver_unregister(struct comedi_driver *);
>>   /* comedi_pci.c - comedi PCI driver specific functions */
>>
>>   /*
>> - * PCI Vendor IDs not in <linux/pci_ids.h>
>> + * PCI Vendor IDs not in <uapi/linux/pci_ids.h>
>>    */
>>   #define PCI_VENDOR_ID_KOLTER		0x1001
>>   #define PCI_VENDOR_ID_ICP		0x104c
>>

NAK.

As Ian pointed out, this is not needed.

The top level Makefile defines USERINCLUDE with this include path (among
others):

	-I$(srctree)/include/uapi

And LINUXINCLUDE with these patchs (among others):

	$(if $(KBUILD_SRC), -I$(srctree)/include)
	$(USERINCLUDE)

This results in #include <linux/...> picking up the header from the appropriate
path automatically. You don't need to specify the uapi directory to get the user
API header files.

Regards,
Hartley


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/