diff options
| author | Scott Long <scottl@FreeBSD.org> | 2020-04-16 03:28:28 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2020-04-16 03:28:28 +0000 |
| commit | 8fae77f50cd4d883c0ab188b515857a95a9746b3 (patch) | |
| tree | 63f644d626c229c9f1c1d1fd1cae9bab148a4817 /sys/dev/mpr | |
| parent | 02371ceb33218cb8400b4c8803fa2221861f9498 (diff) | |
Add a small hack to the ioctl header files so that both mpr and mps can
be included. This isn't a great solution, but fixing it correctly is a
bigger task and this is the lesser of the existing evils.
Notes
Notes:
svn path=/head/; revision=360001
Diffstat (limited to 'sys/dev/mpr')
| -rw-r--r-- | sys/dev/mpr/mpr_ioctl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/mpr/mpr_ioctl.h b/sys/dev/mpr/mpr_ioctl.h index dbcedb0fb8d9..f81d01c7ad48 100644 --- a/sys/dev/mpr/mpr_ioctl.h +++ b/sys/dev/mpr/mpr_ioctl.h @@ -363,6 +363,7 @@ typedef struct mpr_btdh_mapping #define MPRIO_RAID_ACTION _IOWR('M', 205, struct mpr_raid_action) #define MPRIO_MPR_COMMAND _IOWR('M', 210, struct mpr_usr_command) +#ifndef MPTIOCTL #define MPTIOCTL ('I') #define MPTIOCTL_GET_ADAPTER_DATA _IOWR(MPTIOCTL, 1,\ struct mpr_adapter_data) @@ -385,5 +386,6 @@ typedef struct mpr_btdh_mapping struct mpr_reg_access) #define MPTIOCTL_BTDH_MAPPING _IOWR(MPTIOCTL, 11,\ struct mpr_btdh_mapping) +#endif /* MPTIOCTL */ #endif /* !_MPR_IOCTL_H_ */ |