From mboxrd@z Thu Jan 1 00:00:00 1970 From: heiko@sntech.de (Heiko =?ISO-8859-1?Q?St=FCbner?=) Date: Fri, 17 Apr 2015 22:01:39 +0200 Subject: [PATCH] iommu: rockchip: fix build without CONFIG_OF In-Reply-To: <3138014.xYAj3FssJ8@wuerfel> References: <3138014.xYAj3FssJ8@wuerfel> Message-ID: <5765512.Hv9Xq97Xsz@diego> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Am Freitag, 10. April 2015, 23:58:24 schrieb Arnd Bergmann: > 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") not sure if another one is needed, but nevertheless Reviewed-by: Heiko Stuebner