Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/pwm/pwm-tegra.c b/drivers/pwm/pwm-tegra.c
index 057465e0553c..30c0e2b70ce8 100644
--- a/drivers/pwm/pwm-tegra.c
+++ b/drivers/pwm/pwm-tegra.c
@@ -210,7 +210,7 @@ static int tegra_pwm_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit tegra_pwm_remove(struct platform_device *pdev)
+static int tegra_pwm_remove(struct platform_device *pdev)
 {
         struct tegra_pwm_chip *pc = platform_get_drvdata(pdev);
         int i;
@@ -249,7 +249,7 @@ static struct platform_driver tegra_pwm_driver = {
                 .of_match_table = of_match_ptr(tegra_pwm_of_match),
         },
         .probe = tegra_pwm_probe,
-        .remove = __devexit_p(tegra_pwm_remove),
+        .remove = tegra_pwm_remove,
 };
 
 module_platform_driver(tegra_pwm_driver);