Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm
[~shefty/rdma-dev.git] / drivers / pwm / pwm-tegra.c
index 71900e8..af3ab48 100644 (file)
@@ -233,7 +233,6 @@ static int tegra_pwm_remove(struct platform_device *pdev)
        return pwmchip_remove(&pc->chip);
 }
 
-#ifdef CONFIG_OF
 static struct of_device_id tegra_pwm_of_match[] = {
        { .compatible = "nvidia,tegra20-pwm" },
        { .compatible = "nvidia,tegra30-pwm" },
@@ -241,12 +240,11 @@ static struct of_device_id tegra_pwm_of_match[] = {
 };
 
 MODULE_DEVICE_TABLE(of, tegra_pwm_of_match);
-#endif
 
 static struct platform_driver tegra_pwm_driver = {
        .driver = {
                .name = "tegra-pwm",
-               .of_match_table = of_match_ptr(tegra_pwm_of_match),
+               .of_match_table = tegra_pwm_of_match,
        },
        .probe = tegra_pwm_probe,
        .remove = tegra_pwm_remove,