diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-30 08:57:22 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-01-30 08:57:22 +0100 |
| commit | 1b62d134d3c5f9e67de096af7ea3e9fe48966f17 (patch) | |
| tree | be30467e997cc8ba0d350309dd498f00cb69969b /arch/m32r/kernel/align.c | |
| parent | ACPICA: Tables: Fix hidden logic related to acpi_tb_install_standard_table() (diff) | |
| parent | ACPICA: Update version to 20161222 (diff) | |
| download | wireguard-linux-1b62d134d3c5f9e67de096af7ea3e9fe48966f17.tar.xz wireguard-linux-1b62d134d3c5f9e67de096af7ea3e9fe48966f17.zip | |
Merge back earlier ACPICA changes for v4.11.
Diffstat (limited to 'arch/m32r/kernel/align.c')
| -rw-r--r-- | arch/m32r/kernel/align.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/kernel/align.c b/arch/m32r/kernel/align.c index ab871ccd33f8..ec51e5b34860 100644 --- a/arch/m32r/kernel/align.c +++ b/arch/m32r/kernel/align.c @@ -5,7 +5,7 @@ */ #include <asm/ptrace.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> static int get_reg(struct pt_regs *regs, int nr) { |