diff --git a/drivers/staging/media/atomisp/Kconfig b/drivers/staging/media/atomisp/Kconfig
index f9507b7b8906a..c4f3049b0706e 100644
--- a/drivers/staging/media/atomisp/Kconfig
+++ b/drivers/staging/media/atomisp/Kconfig
@@ -31,6 +31,6 @@ config VIDEO_ATOMISP_ISP2401
 	  Disabling it enables support for Atom ISP2400-based boards
 	  (Merrifield and Baytrail SoCs).
 
-if INTEL_ATOMISP
+if VIDEO_ATOMISP
 source "drivers/staging/media/atomisp/i2c/Kconfig"
 endif
diff --git a/drivers/staging/media/atomisp/Makefile b/drivers/staging/media/atomisp/Makefile
index c032444a4db65..4f09d0c431dae 100644
--- a/drivers/staging/media/atomisp/Makefile
+++ b/drivers/staging/media/atomisp/Makefile
@@ -2,7 +2,6 @@
 # Makefile for camera drivers.
 #
 obj-$(CONFIG_INTEL_ATOMISP) += i2c/
-obj-$(CONFIG_INTEL_ATOMISP) += platform/
 obj-$(CONFIG_VIDEO_ATOMISP) += atomisp.o
 
 # While on staging, keep debug enabled
@@ -24,6 +23,7 @@ atomisp-objs += \
 	pci/atomisp_subdev.o \
 	pci/atomisp_tpg.o \
 	pci/atomisp_v4l2.o \
+	pci/atomisp_gmin_platform.o \
 	pci/sh_css_firmware.o \
 	pci/sh_css_host_data.o \
 	pci/sh_css_hrt.o \
diff --git a/drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c b/drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
similarity index 100%
rename from drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c
rename to drivers/staging/media/atomisp/pci/atomisp_gmin_platform.c
diff --git a/drivers/staging/media/atomisp/platform/Makefile b/drivers/staging/media/atomisp/platform/Makefile
deleted file mode 100644
index 0e3b7e1c81c68..0000000000000
--- a/drivers/staging/media/atomisp/platform/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for camera drivers.
-#
-
-obj-$(CONFIG_INTEL_ATOMISP) += intel-mid/
diff --git a/drivers/staging/media/atomisp/platform/intel-mid/Makefile b/drivers/staging/media/atomisp/platform/intel-mid/Makefile
deleted file mode 100644
index c53db1364e217..0000000000000
--- a/drivers/staging/media/atomisp/platform/intel-mid/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Makefile for intel-mid devices.
-#
-obj-$(CONFIG_INTEL_ATOMISP) += atomisp_gmin_platform.o