diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-01-07 18:51:13 -0500 |
| commit | abaee091a18c19ccd86feb1c8374585d82e96777 (patch) | |
| tree | 01602bae73e1278c3d98dafe1c269049927c58ce /include/linux/scpi_protocol.h | |
| parent | a2746fb16e41b7c8f02aa4d2605ecce97abbebbd (diff) | |
| parent | 3f8d6f2a0797e8c650a47e5c1b5c2601a46f4293 (diff) | |
Merge branch 'jejb-scsi' into misc
Diffstat (limited to 'include/linux/scpi_protocol.h')
| -rw-r--r-- | include/linux/scpi_protocol.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h index 80af3cd35ae4..72ce932c69b2 100644 --- a/include/linux/scpi_protocol.h +++ b/include/linux/scpi_protocol.h | |||
| @@ -71,7 +71,7 @@ struct scpi_ops { | |||
| 71 | int (*sensor_get_value)(u16, u32 *); | 71 | int (*sensor_get_value)(u16, u32 *); |
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | #if IS_ENABLED(CONFIG_ARM_SCPI_PROTOCOL) | 74 | #if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL) |
| 75 | struct scpi_ops *get_scpi_ops(void); | 75 | struct scpi_ops *get_scpi_ops(void); |
| 76 | #else | 76 | #else |
| 77 | static inline struct scpi_ops *get_scpi_ops(void) { return NULL; } | 77 | static inline struct scpi_ops *get_scpi_ops(void) { return NULL; } |