commit | 0f672f6c0b52b7b0700b0915c72b540721af4465 | [log] [tgz] |
---|---|---|
author | David Brazdil <dbrazdil@google.com> | Tue Dec 10 10:32:29 2019 +0000 |
committer | David Brazdil <dbrazdil@google.com> | Tue Dec 10 19:03:18 2019 +0000 |
tree | 85c8cba019caa205e4f8920d72d93f6d6deaf29c | |
parent | 3a0ad55d848b50499b68d7141d4eca997fce28ef [diff] |
Update Linux to v5.4.2 Change-Id: Idf6911045d9d382da2cfe01b1edff026404ac8fd
diff --git a/drivers/sh/intc/Kconfig b/drivers/sh/intc/Kconfig index 6a1b05d..5c70170 100644 --- a/drivers/sh/intc/Kconfig +++ b/drivers/sh/intc/Kconfig
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config SH_INTC bool select IRQ_DOMAIN
diff --git a/drivers/sh/intc/Makefile b/drivers/sh/intc/Makefile index 54ec2a0..bdd8553 100644 --- a/drivers/sh/intc/Makefile +++ b/drivers/sh/intc/Makefile
@@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only obj-y := access.o chip.o core.o handle.o irqdomain.o virq.o obj-$(CONFIG_INTC_BALANCING) += balancing.o
diff --git a/drivers/sh/intc/userimask.c b/drivers/sh/intc/userimask.c index e649cea..87d69e7 100644 --- a/drivers/sh/intc/userimask.c +++ b/drivers/sh/intc/userimask.c
@@ -14,7 +14,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/stat.h> -#include <asm/sizes.h> +#include <linux/sizes.h> #include "internals.h" static void __iomem *uimask;