diff options
| author | Will McVicker <willmcvicker@google.com> | 2021-09-09 14:33:35 -0700 |
|---|---|---|
| committer | Will McVicker <willmcvicker@google.com> | 2021-09-09 15:28:03 -0700 |
| commit | 29999f78c9efbc2669beb38f34e7ea98d0a9b1d9 (patch) | |
| tree | be18dbf4f49128a6895d7137ec1925ba0429c01a | |
| parent | c2ebb1e355025069fd31598de8029726cbebd59c (diff) | |
| download | trusty-29999f78c9efbc2669beb38f34e7ea98d0a9b1d9.tar.gz | |
Merge android-mainline-p21-staging into android-gs-p21-mainline
Bug: 199354250
Change-Id: I768f9b807c8a2dc80a0e0bd678a407de3d51cadf
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Signed-off-by: Will McVicker <willmcvicker@google.com>
| -rw-r--r-- | drivers/trusty/trusty-log.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/trusty/trusty-log.c b/drivers/trusty/trusty-log.c index 315e482..878e589 100644 --- a/drivers/trusty/trusty-log.c +++ b/drivers/trusty/trusty-log.c @@ -14,6 +14,7 @@ #include <linux/log2.h> #include <linux/miscdevice.h> #include <linux/seq_file.h> +#include <linux/panic_notifier.h> #include <asm/page.h> #include "trusty-log.h" |