diff options
| author | Tejun Heo <tj@kernel.org> | 2013-01-23 18:31:01 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-01-23 18:31:01 +0100 |
| commit | c14afb82ffff5903a701a9fb737ac20f36d1f755 (patch) | |
| tree | 304dcc7b1d7b9a5f564f7e978228e61ef41fbef2 /drivers/input/touchscreen/ti_am335x_tsc.c | |
| parent | async, kmod: warn on synchronous request_module() from async workers (diff) | |
| parent | Merge tag '3.8-pci-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-c14afb82ffff5903a701a9fb737ac20f36d1f755.tar.xz linux-c14afb82ffff5903a701a9fb737ac20f36d1f755.zip | |
Merge branch 'master' into for-3.9-async
To receive f56c3196f251012de9b3ebaff55732a9074fdaae ("async: fix
__lowest_in_progress()").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/input/touchscreen/ti_am335x_tsc.c')
| -rw-r--r-- | drivers/input/touchscreen/ti_am335x_tsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 7a18a8a15228..51e7b87827a4 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -258,7 +258,7 @@ static irqreturn_t titsc_irq(int irq, void *dev) * The functions for inserting/removing driver as a module. */ -static int __devinit titsc_probe(struct platform_device *pdev) +static int titsc_probe(struct platform_device *pdev) { struct titsc *ts_dev; struct input_dev *input_dev; @@ -327,7 +327,7 @@ err_free_mem: return err; } -static int __devexit titsc_remove(struct platform_device *pdev) +static int titsc_remove(struct platform_device *pdev) { struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; struct titsc *ts_dev = tscadc_dev->tsc; @@ -384,7 +384,7 @@ static const struct dev_pm_ops titsc_pm_ops = { static struct platform_driver ti_tsc_driver = { .probe = titsc_probe, - .remove = __devexit_p(titsc_remove), + .remove = titsc_remove, .driver = { .name = "tsc", .owner = THIS_MODULE, |