diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild
index 2622f2941a64..62b4706f7326 100644
--- a/drivers/gpu/arm/Kbuild
+++ b/drivers/gpu/arm/Kbuild
@@ -23,6 +23,4 @@ obj-$(CONFIG_MALI_MIDGARD) += midgard/
 
 obj-$(CONFIG_MALI400)      += mali400/
 
-obj-$(CONFIG_MALI_BIFROST_FOR_ANDROID) += bifrost/
-
-obj-$(CONFIG_MALI_BIFROST_FOR_LINUX) += bifrost_for_linux/
+obj-$(CONFIG_MALI_BIFROST) += bifrost/
diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index d6211e33276c..64ede484d1dc 100644
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -23,15 +23,4 @@ source "drivers/gpu/arm/mali400/mali/Kconfig"
 
 source "drivers/gpu/arm/midgard/Kconfig"
 
-choice
-	prompt "Mali bifrost driver"
-
-config MALI_BIFROST_FOR_ANDROID
-	bool "Mali Bifrost for Android"
-
-config MALI_BIFROST_FOR_LINUX
-	bool "Mali Bifrost for Linux only"
-
-endchoice
-
 source "drivers/gpu/arm/bifrost/Kconfig"