Merge "Revert "drm/msm/dpu: fix mismatch in function argument.""

drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -105,7 +105,7 @@ struct dpu_rm_hw_iter {
		*/
		int dpu_rm_init(struct dpu_rm *rm,
		struct dpu_mdss_cfg *cat,
		void __iomem *mmio,
		void *mmio,
		struct drm_device *dev);

		/**