diff --git a/drivers/media/video/msm/Makefile b/drivers/media/video/msm/Makefile
index 9767be9..66c9246 100755
--- a/drivers/media/video/msm/Makefile
+++ b/drivers/media/video/msm/Makefile
@@ -3,11 +3,16 @@ ifeq ($(GCC_VERSION),0404)
 CFLAGS_REMOVE_msm_vfe8x.o = -Wframe-larger-than=1024
 endif

+ifdef CONFIG_MACH_MSM7201A_SURF
+       obj-$(CONFIG_MSM_CAMERA) += 7x0x/
+else
 obj-$(CONFIG_MSM_CAMERA) += msm_camera.o msm_v4l2.o msm_axi_qos.o
 obj-$(CONFIG_MSM_CAMERA_FLASH) += flash.o
-obj-$(CONFIG_ARCH_MSM_ARM11) += msm_vfe7x.o msm_io7x.o
+obj-$(CONFIG_ARCH_MSM_ARM11) += msm_vfe7x.o
 obj-$(CONFIG_ARCH_MSM7X30) += msm_vfe31.o msm_io_vfe31.o
 obj-$(CONFIG_ARCH_QSD8X50) += msm_vfe8x.o msm_vfe8x_proc.o msm_io8x.o
+endif
+obj-$(CONFIG_ARCH_MSM_ARM11) += msm_io7x.o
 obj-$(CONFIG_MT9T013) += mt9t013.o mt9t013_reg.o mt9t013_byd.o mt9t013_liteon.o
 obj-$(CONFIG_MT9D112) += mt9d112.o mt9d112_reg.o
 obj-$(CONFIG_MT9P012) += mt9p012_reg.o