diff options
author | 2020-06-11 15:17:57 +0200 | |
---|---|---|
committer | 2020-06-11 15:17:57 +0200 | |
commit | f77d26a9fc525286bcef3d4f98b52e17482cf49c (patch) | |
tree | 6b179c9aa84787773cb601a14a64255e2912154b /include/linux/scpi_protocol.h | |
parent | EDAC/amd64: Add AMD family 17h model 60h PCI IDs (diff) | |
parent | x86/entry: Unbreak __irqentry_text_start/end magic (diff) | |
download | wireguard-linux-f77d26a9fc525286bcef3d4f98b52e17482cf49c.tar.xz wireguard-linux-f77d26a9fc525286bcef3d4f98b52e17482cf49c.zip |
Merge branch 'x86/entry' into ras/core
to fixup conflicts in arch/x86/kernel/cpu/mce/core.c so MCE specific follow
up patches can be applied without creating a horrible merge conflict
afterwards.
Diffstat (limited to 'include/linux/scpi_protocol.h')
-rw-r--r-- | include/linux/scpi_protocol.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/scpi_protocol.h b/include/linux/scpi_protocol.h index ecb004711acf..afbf8037d8db 100644 --- a/include/linux/scpi_protocol.h +++ b/include/linux/scpi_protocol.h @@ -4,6 +4,10 @@ * * Copyright (C) 2014 ARM Ltd. */ + +#ifndef _LINUX_SCPI_PROTOCOL_H +#define _LINUX_SCPI_PROTOCOL_H + #include <linux/types.h> struct scpi_opp { @@ -71,3 +75,5 @@ struct scpi_ops *get_scpi_ops(void); #else static inline struct scpi_ops *get_scpi_ops(void) { return NULL; } #endif + +#endif /* _LINUX_SCPI_PROTOCOL_H */ |