diff --git a/[refs] b/[refs] index 6eb61827d20a..2a7e2172ba7b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb97b73d75d5c9af7c78c05106de9e3fdc4455ab +refs/heads/master: 7f0d50391adf371a0e66da0a1a44ba5cc6744ee8 diff --git a/trunk/include/linux/cciss_ioctl.h b/trunk/include/linux/cciss_ioctl.h index 424d5e622b43..6e27f42e3a57 100644 --- a/trunk/include/linux/cciss_ioctl.h +++ b/trunk/include/linux/cciss_ioctl.h @@ -10,8 +10,8 @@ typedef struct _cciss_pci_info_struct { unsigned char bus; - unsigned short domain; unsigned char dev_fn; + unsigned short domain; __u32 board_id; } cciss_pci_info_struct;