diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-14 23:58:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-14 23:58:53 -0800 |
| commit | df0c65ec104c8a0c5ccdc02fda56f31ac7fe5bdc (patch) | |
| tree | 7913bec67110cb6d9531d6b72f4c770d9955a81a /include | |
| parent | db87e2310e4eead66d2c29a4d51ec5946dddf0dc (diff) | |
| parent | 3bda2b55b41dacecc8fdf44d9066e54b3a0b827a (diff) | |
Merge "Merge android-4.4.96 (aed4c54) into msm-4.4"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/spi/spidev.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 333d0ca6940f..516d83041206 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1292,7 +1292,7 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg, unsigned long *load_addr, unsigned long *load_size); -efi_status_t efi_parse_options(char *cmdline); +efi_status_t efi_parse_options(char const *cmdline); bool efi_runtime_disabled(void); #endif /* _LINUX_EFI_H */ diff --git a/include/uapi/linux/spi/spidev.h b/include/uapi/linux/spi/spidev.h index dd5f21e75805..856de39d0b89 100644 --- a/include/uapi/linux/spi/spidev.h +++ b/include/uapi/linux/spi/spidev.h @@ -23,6 +23,7 @@ #define SPIDEV_H #include <linux/types.h> +#include <linux/ioctl.h> /* User space versions of kernel symbols for SPI clocking modes, * matching <linux/spi/spi.h> |