diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-23 14:43:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-23 14:43:47 -0400 |
| commit | 331c7438104149655a5fe96ed4a3d29b00d422de (patch) | |
| tree | d7199a387a4fad25e82cf5932950a7e452d0ff10 /include | |
| parent | 4ff63383e3497389e66cf70943a83bdb1810462a (diff) | |
| parent | 1c078ad7d954759d9021b126ad05d063a90ebae6 (diff) | |
| download | u-boot-331c7438104149655a5fe96ed4a3d29b00d422de.tar.gz u-boot-331c7438104149655a5fe96ed4a3d29b00d422de.tar.xz u-boot-331c7438104149655a5fe96ed4a3d29b00d422de.zip | |
Merge branch '2020-06-23-misc-minor-fixes'
- Assorted minor fixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/psci.h | 4 | ||||
| -rw-r--r-- | include/zfs_common.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index 9433df836b..841dbc8da7 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -91,8 +91,8 @@ unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); #else -unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, - unsigned long a2, unsigned long a3) +static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3) { return PSCI_RET_DISABLED; } diff --git a/include/zfs_common.h b/include/zfs_common.h index 027ba91b28..cb83e59e83 100644 --- a/include/zfs_common.h +++ b/include/zfs_common.h @@ -22,6 +22,8 @@ #ifndef __ZFS_COMMON__ #define __ZFS_COMMON__ +#include <part.h> + #define SECTOR_SIZE 0x200 #define SECTOR_BITS 9 |