Merge branch 'pci/switchtec' into next

* pci/switchtec: switchtec: Add device IDs for additional Switchtec products switchtec: Add "running" status flag to fw partition info ioctl

Bjorn Helgaas committed 9 years ago

Commit c781f852 parents 8cd9385 393958d2 files · +41 −2Browse files

Showing the changes to include/uapi/linux (1 of 2 files). Show all

Unified · Split

@@ -39,6 +39,9 @@ struct switchtec_ioctl_flash_info { · 38 unmodified lines
39	__u32 padding;	39	__u32 padding;
40	};	40	};
41		41
		42	#define SWITCHTEC_IOCTL_PART_ACTIVE 1
		43	#define SWITCHTEC_IOCTL_PART_RUNNING 2
		44
42	struct switchtec_ioctl_flash_part_info {	45	struct switchtec_ioctl_flash_part_info {
43	__u32 flash_partition;	46	__u32 flash_partition;
44	__u32 address;	47	__u32 address;