summaryrefslogtreecommitdiff
path: root/include/linux/module.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2026-10-14 14:20:03 +0100
committerMark Brown <broonie@kernel.org>2026-10-14 14:20:03 +0100
commite4622b8294abcb690ce7c8587bc8a49d14d2ef01 (patch)
treecf31370df373f06a1268a5f8a86b09d6f22c1d28 /include/linux/module.h
parentbaa5f780c1804c1d0e8c4e918970ef3221c2e7e6 (diff)
parent08abfa5a161e1b6e6244cb2090b0530bc0920798 (diff)
downloadlinux-next-e4622b8294abcb690ce7c8587bc8a49d14d2ef01.tar.gz
linux-next-e4622b8294abcb690ce7c8587bc8a49d14d2ef01.zip
Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git
# Conflicts: # drivers/gpu/drm/clients/drm_fbdev_helper.c
Diffstat (limited to 'include/linux/module.h')
-rw-r--r--include/linux/module.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h
index a6abde12a458..88a795a5d6af 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -24,7 +24,6 @@
#include <linux/jump_label.h>
#include <linux/export.h>
#include <linux/rbtree_latch.h>
-#include <linux/error-injection.h>
#include <linux/tracepoint-defs.h>
#include <linux/srcu.h>
#include <linux/static_call_types.h>