diff --git a/drivers/Kconfig b/drivers/Kconfig
index dcecc9f6e33f78de53cf18655624b27d2abe76c4..9310808ee3855d2b74a252bdd45c1efb3bd40880 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -204,6 +204,8 @@ source "drivers/thunderbolt/Kconfig"
 
 source "drivers/android/Kconfig"
 
+source "drivers/hooks/Kconfig"
+
 source "drivers/gpu/trace/Kconfig"
 
 source "drivers/nvdimm/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 5762280377186c47739ed9da226022b061658895..9d67932a503758579d30e661dcbd3cca59c64fe1 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -178,6 +178,7 @@ obj-$(CONFIG_CORESIGHT)		+= hwtracing/coresight/
 obj-y				+= hwtracing/intel_th/
 obj-$(CONFIG_STM)		+= hwtracing/stm/
 obj-$(CONFIG_ANDROID)		+= android/
+obj-$(CONFIG_VENDOR_HOOKS)	+= hooks/
 obj-$(CONFIG_NVMEM)		+= nvmem/
 obj-$(CONFIG_FPGA)		+= fpga/
 obj-$(CONFIG_FSI)		+= fsi/
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index 32fb9e5b6195e41d5c5d591b12bdab2280477812..53b22e26266c3ea2eca4be14447b97d89de46c21 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -54,15 +54,6 @@ config ANDROID_BINDER_IPC_SELFTEST
 	  exhaustively with combinations of various buffer sizes and
 	  alignments.
 
-config ANDROID_VENDOR_HOOKS
-	bool "Android Vendor Hooks"
-	depends on TRACEPOINTS
-	help
-	  Enable vendor hooks implemented as tracepoints
-
-	  Allow vendor modules to attach to tracepoint "hooks" defined via
-	  DECLARE_HOOK or DECLARE_RESTRICTED_HOOK.
-
 endif # if ANDROID
 
 endmenu
diff --git a/drivers/android/Makefile b/drivers/android/Makefile
index d488047415a0aa7cc88dea531b9edc27b357ad4d..c9d3d0c99c25717a4bf6867c10732e5eb9022ad1 100644
--- a/drivers/android/Makefile
+++ b/drivers/android/Makefile
@@ -4,4 +4,3 @@ ccflags-y += -I$(src)			# needed for trace events
 obj-$(CONFIG_ANDROID_BINDERFS)		+= binderfs.o
 obj-$(CONFIG_ANDROID_BINDER_IPC)	+= binder.o binder_alloc.o
 obj-$(CONFIG_ANDROID_BINDER_IPC_SELFTEST) += binder_alloc_selftest.o
-obj-$(CONFIG_ANDROID_VENDOR_HOOKS) += vendor_hooks.o
diff --git a/drivers/hooks/Kconfig b/drivers/hooks/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..1c0e33ef9a564971365d906d4b2303a75fdb84a6
--- /dev/null
+++ b/drivers/hooks/Kconfig
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0
+menu "Vendor Hooks"
+
+config VENDOR_HOOKS
+        bool "Vendor Hooks"
+        depends on TRACEPOINTS
+        help
+          Enable vendor hooks implemented as tracepoints
+
+          Allow vendor modules to attach to tracepoint "hooks" defined via
+          DECLARE_HOOK or DECLARE_RESTRICTED_HOOK.
+
+endmenu
diff --git a/drivers/hooks/Makefile b/drivers/hooks/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..1592308269665617d8327b735842281142810995
--- /dev/null
+++ b/drivers/hooks/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+ccflags-y += -I$(src)                   # needed for trace events
+
+obj-$(CONFIG_VENDOR_HOOKS) += vendor_hooks.o
diff --git a/drivers/android/vendor_hooks.c b/drivers/hooks/vendor_hooks.c
similarity index 91%
rename from drivers/android/vendor_hooks.c
rename to drivers/hooks/vendor_hooks.c
index 4a403a81eed3f5b9188c7e191b38d302157c0234..359989d1bb32e39f9b656a8e1091e1250a55645e 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/hooks/vendor_hooks.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /* vendor_hook.c
  *
- * Android Vendor Hook Support
+ * Vendor Hook Support
  *
  * Copyright (C) 2020 Google, Inc.
  */
diff --git a/include/trace/hooks/vendor_hooks.h b/include/trace/hooks/vendor_hooks.h
index 3661e50565192999142b8660666457ca3585dc51..ab8864da66d812ae8281f74f0d10f0e516a16fe7 100644
--- a/include/trace/hooks/vendor_hooks.h
+++ b/include/trace/hooks/vendor_hooks.h
@@ -9,7 +9,7 @@
 
 #include <linux/tracepoint.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
+#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_VENDOR_HOOKS)
 
 #define DECLARE_HOOK DECLARE_TRACE
 
@@ -111,7 +111,7 @@
 
 #endif /* TRACE_HEADER_MULTI_READ */
 
-#else /* !CONFIG_TRACEPOINTS || !CONFIG_ANDROID_VENDOR_HOOKS */
+#else /* !CONFIG_TRACEPOINTS || !CONFIG_VENDOR_HOOKS */
 /* suppress trace hooks */
 #define DECLARE_HOOK DECLARE_EVENT_NOP
 #define DECLARE_RESTRICTED_HOOK(name, proto, args, cond)		\