diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /include/linux/soc | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'include/linux/soc')
| -rw-r--r-- | include/linux/soc/ti/cppi5.h | 1 | ||||
| -rw-r--r-- | include/linux/soc/ti/k3-navss-ringacc.h | 1 | ||||
| -rw-r--r-- | include/linux/soc/ti/ti_sci_protocol.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h index 34038b31f7..cfdf7ea29f 100644 --- a/include/linux/soc/ti/cppi5.h +++ b/include/linux/soc/ti/cppi5.h @@ -10,6 +10,7 @@ #include <hexdump.h> #include <linux/bitops.h> +#include <linux/bug.h> /** * Descriptor header, present in all types of descriptors diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h index 487dfe9859..7b027f8bd4 100644 --- a/include/linux/soc/ti/k3-navss-ringacc.h +++ b/include/linux/soc/ti/k3-navss-ringacc.h @@ -9,6 +9,7 @@ #define __SOC_TI_K3_NAVSS_RINGACC_API_H_ #include <dm/ofnode.h> +#include <linux/bitops.h> /** * enum k3_nav_ring_mode - &struct k3_nav_ring_cfg mode diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 8c4863efe1..eb916ba101 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -20,6 +20,7 @@ * @firmware_revision: Firmware revision (not usually used). * @firmware_description: Firmware description (not usually used). */ +#include <linux/bitops.h> struct ti_sci_version_info { u8 abi_major; u8 abi_minor; |