From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joerg Roedel Subject: Re: [PATCH] iommu: rockchip: fix build without CONFIG_OF Date: Tue, 5 May 2015 15:19:29 +0200 Message-ID: <20150505131929.GE5438@suse.de> References: <3138014.xYAj3FssJ8@wuerfel> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <3138014.xYAj3FssJ8@wuerfel> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Arnd Bergmann Cc: Heiko Stuebner , Daniel Kurtz , linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Thierry Reding , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: iommu@lists.linux-foundation.org On Fri, Apr 10, 2015 at 11:58:24PM +0200, Arnd Bergmann wrote: > The rockchip iommu driver references its of_device_id table > from the init function, which fails to build when the table > is undefined: > > iommu/rockchip-iommu.c: In function 'rk_iommu_init': > iommu/rockchip-iommu.c:1029:35: error: 'rk_iommu_dt_ids' undeclared (first use in this function) > np = of_find_matching_node(NULL, rk_iommu_dt_ids); > > This removes the #ifdef and the corresponding of_match_ptr wrapper > to make it build both with CONFIG_OF enabled or disabled. > > Signed-off-by: Arnd Bergmann > Fixes: 425061b0f5074 ("iommu/rockchip: Play nice in multi-platform builds") Applied to iommu/fixes, thanks.