diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:13:02 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:13:02 +0100 |
| commit | ef0bf620e9b81845368b9c72ffdbd6834e424526 (patch) | |
| tree | 7862e4ca1aa61a20f8e11502276b7f8633a39aa4 /include/linux/scpi_protocol.h | |
| parent | 425a5072dcd1bd895eea90a6b495392b6358ebd0 (diff) | |
| parent | a6c2f87b8820e956ea0f731dcf0e45949bb37a8b (diff) | |
Merge branch 'irq/wire-msi-bridge' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the MSI wire bridge implementation from Marc Zyngier along with
the first user of it. This is infrastructure to support a wired
interrupt to MSI interrupt brigde. The first user is mbigen found in
Hisilicon ARM SoCs.
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 { int (*sensor_get_value)(u16, u32 *); }; -#if IS_ENABLED(CONFIG_ARM_SCPI_PROTOCOL) +#if IS_REACHABLE(CONFIG_ARM_SCPI_PROTOCOL) struct scpi_ops *get_scpi_ops(void); #else static inline struct scpi_ops *get_scpi_ops(void) { return NULL; } |