diff --git a/drivers/gpu/arm/Kbuild b/drivers/gpu/arm/Kbuild
index eb2a40985383..3f1675ca0dfb 100755
--- a/drivers/gpu/arm/Kbuild
+++ b/drivers/gpu/arm/Kbuild
@@ -16,8 +16,6 @@
 
 obj-$(CONFIG_MALI_MIDGARD_FOR_LINUX) += midgard_for_linux/
 
-ifneq ($(CONFIG_MALI_MIDGARD_FOR_LINUX),y)
-obj-y += midgard/
-endif
+obj-$(CONFIG_MALI_MIDGARD_FOR_ANDROID) += midgard/
 
 obj-$(CONFIG_MALI400)      += mali400/
diff --git a/drivers/gpu/arm/Kconfig b/drivers/gpu/arm/Kconfig
index 1f30eb541d65..10a71c6a3c23 100755
--- a/drivers/gpu/arm/Kconfig
+++ b/drivers/gpu/arm/Kconfig
@@ -11,9 +11,18 @@
 # Boston, MA  02110-1301, USA.
 #
 #
+#
+source "drivers/gpu/arm/mali400/mali/Kconfig"
 
+choice
+	prompt "Mali Midgard driver"
 
+config MALI_MIDGARD_FOR_ANDROID
+	bool "Mali Midgard for Android"
+
+config MALI_MIDGARD_FOR_LINUX
+	bool "Mali Midgard for Linux only"
+
+endchoice
 
-menu "ARM GPU Configuration"
 source "drivers/gpu/arm/midgard/Kconfig"
-endmenu
diff --git a/drivers/gpu/arm/midgard_for_linux/Kconfig b/drivers/gpu/arm/midgard_for_linux/Kconfig
index 201832b262d4..5cafc9e8e432 100644
--- a/drivers/gpu/arm/midgard_for_linux/Kconfig
+++ b/drivers/gpu/arm/midgard_for_linux/Kconfig
@@ -15,8 +15,7 @@
 
 
 menuconfig MALI_MIDGARD
-	tristate "Mali Midgard series support"
-	select GPU_TRACEPOINTS if ANDROID
+	tristate "Mali Midgard series support (Linux only)"
 	default n
 	help
 	  Enable this option to build support for a ARM Mali Midgard GPU.
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 1447654733be..e0d11399139e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -26,16 +26,7 @@ source "drivers/gpu/drm/Kconfig"
 
 source "drivers/gpu/rogue_m/Kconfig"
 
-config MALI_MIDGARD_FOR_LINUX
-	bool "Mali Midgard for RK Linux device only"
-	default n
-
-# midgard src for devices other than RK Linux device.
-if !MALI_MIDGARD_FOR_LINUX
-	source "drivers/gpu/arm/midgard/Kconfig"
-endif
-
-source "drivers/gpu/arm/mali400/mali/Kconfig"
+source "drivers/gpu/arm/Kconfig"
 
 menu "Frame buffer Devices"
 source "drivers/video/fbdev/Kconfig"