iommu/rockchip: Fix build without CONFIG_OF
authorArnd Bergmann <[email protected]>
Fri, 10 Apr 2015 21:58:24 +0000 (23:58 +0200)
committerJoerg Roedel <[email protected]>
Tue, 5 May 2015 13:18:24 +0000 (15:18 +0200)
commitd9e7eb152bb24f06028a0d10b054e39ebdf14f9c
treef1d49c35c68aab11a9aa8858d8d95929f22b9463
parent1bf1b431d98d7e5b5419876d4c219469e60693e1
iommu/rockchip: Fix build without CONFIG_OF

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 <[email protected]>
Fixes: 425061b0f5074 ("iommu/rockchip: Play nice in multi-platform builds")
Reviewed-by: Thierry Reding <[email protected]>
Reviewed-by: Heiko Stuebner <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
drivers/iommu/rockchip-iommu.c