diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-30 11:43:18 -0400 |
| commit | 5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035 (patch) | |
| tree | d04c64ec751e7adf24de995ce0fa7eabc88865bc /include/linux | |
| parent | 6b3c74428a3faca92701843c954b717e8d186b17 (diff) | |
| parent | e35c2a8fdd41a34c06c409ce700c5d5591429367 (diff) | |
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips into next
- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/psci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index 9433df836b6..841dbc8da7e 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; } |