Merge branch 'master' into queue

[~andy/linux] / drivers / input / touchscreen / htcpen.c

diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
index 32a451c89d5359a91e15135b7ffcf5c0a88d917c..6c4fb84369575df40bbfe8bc6a7addcd7a913e15 100644 (file)
--- a/drivers/input/touchscreen/htcpen.c
+++ b/drivers/input/touchscreen/htcpen.c
@@ -174,7 +174,7 @@ static int htcpen_isa_probe(struct device *dev, unsigned int id)
        return err;
 }
 
-static int __devexit htcpen_isa_remove(struct device *dev, unsigned int id)
+static int htcpen_isa_remove(struct device *dev, unsigned int id)
 {
        struct input_dev *htcpen_dev = dev_get_drvdata(dev);