Merge remote-tracking branch 'asoc/fix/wm2200' into asoc-next

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

diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index 6df3f88a46ddfc5752c598dd3cc9ac9360de2fde..a6666e142a91b04719efcc4f7721a66df06cad23 100644 (file)
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -90,7 +90,7 @@ static irqreturn_t bfin_rotary_isr(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static int __devinit bfin_rotary_probe(struct platform_device *pdev)
+static int bfin_rotary_probe(struct platform_device *pdev)
 {
        struct bfin_rotary_platform_data *pdata = pdev->dev.platform_data;
        struct bfin_rot *rotary;
@@ -196,7 +196,7 @@ out1:
        return error;
 }
 
-static int __devexit bfin_rotary_remove(struct platform_device *pdev)
+static int bfin_rotary_remove(struct platform_device *pdev)
 {
        struct bfin_rot *rotary = platform_get_drvdata(pdev);