Merge branch 'pm-cpufreq' into fixes

[~andy/linux] / drivers / input / misc / sgi_btns.c

diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c
index 5d9fd55711991bfb1a701eb0f8ba26dd03b4687d..ad6415ceaf5f7c7efcefca4abd44e63cfd588b6c 100644 (file)
--- a/drivers/input/misc/sgi_btns.c
+++ b/drivers/input/misc/sgi_btns.c
@@ -91,7 +91,7 @@ static void handle_buttons(struct input_polled_dev *dev)
        }
 }
 
-static int __devinit sgi_buttons_probe(struct platform_device *pdev)
+static int sgi_buttons_probe(struct platform_device *pdev)
 {
        struct buttons_dev *bdev;
        struct input_polled_dev *poll_dev;
@@ -143,7 +143,7 @@ static int __devinit sgi_buttons_probe(struct platform_device *pdev)
        return error;
 }
 
-static int __devexit sgi_buttons_remove(struct platform_device *pdev)
+static int sgi_buttons_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct buttons_dev *bdev = dev_get_drvdata(dev);
@@ -158,7 +158,7 @@ static int __devexit sgi_buttons_remove(struct platform_device *pdev)
 
 static struct platform_driver sgi_buttons_driver = {
        .probe  = sgi_buttons_probe,
-       .remove = __devexit_p(sgi_buttons_remove),
+       .remove = sgi_buttons_remove,
        .driver = {
                .name   = "sgibtns",
                .owner  = THIS_MODULE,