From 8fbcaf7c0e03144ce545c8c353354b8e0eaa6ba5 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Fri, 15 Feb 2013 15:02:22 -0700 Subject: [PATCH] --- yaml --- r: 358737 b: refs/heads/master c: 838bf09d4fa01d39417e42c731aa31d7a256fb7c h: refs/heads/master i: 358735: a70c9bf9107ef09792ddd71c3ffcb5ad4d70d252 v: v3 --- [refs] | 2 +- trunk/drivers/pwm/pwm-tegra.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 028560f07d70..7a3d00697370 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83cfd72669ff708c9d21f214606be785ea8a685c +refs/heads/master: 838bf09d4fa01d39417e42c731aa31d7a256fb7c diff --git a/trunk/drivers/pwm/pwm-tegra.c b/trunk/drivers/pwm/pwm-tegra.c index 30c0e2b70ce8..f7770312c1a9 100644 --- a/trunk/drivers/pwm/pwm-tegra.c +++ b/trunk/drivers/pwm/pwm-tegra.c @@ -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,