diff options
author | Nicolas Pitre | 2009-03-16 02:41:23 +0100 |
---|---|---|
committer | Nicolas Pitre | 2009-03-16 02:41:23 +0100 |
commit | d6f818f71fa5db79969aaecba302745199376169 (patch) | |
tree | fcdedce488db0f80c7a816e0b52df83a01972838 /drivers/input/keyboard/spitzkbd.c | |
parent | [ARM] Orion: Fix some typos in the DNS-323 support code (diff) | |
parent | [ARM] update mach-types (diff) | |
download | kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.tar.gz kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.tar.xz kernel-qcow2-linux-d6f818f71fa5db79969aaecba302745199376169.zip |
Merge commit '305b07680f' into orion/master
Diffstat (limited to 'drivers/input/keyboard/spitzkbd.c')
-rw-r--r-- | drivers/input/keyboard/spitzkbd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index c48b76a46a58..9d1781a618e9 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c @@ -343,7 +343,7 @@ static int spitzkbd_resume(struct platform_device *dev) #define spitzkbd_resume NULL #endif -static int __init spitzkbd_probe(struct platform_device *dev) +static int __devinit spitzkbd_probe(struct platform_device *dev) { struct spitzkbd *spitzkbd; struct input_dev *input_dev; @@ -444,7 +444,7 @@ static int __init spitzkbd_probe(struct platform_device *dev) return err; } -static int spitzkbd_remove(struct platform_device *dev) +static int __devexit spitzkbd_remove(struct platform_device *dev) { int i; struct spitzkbd *spitzkbd = platform_get_drvdata(dev); @@ -470,7 +470,7 @@ static int spitzkbd_remove(struct platform_device *dev) static struct platform_driver spitzkbd_driver = { .probe = spitzkbd_probe, - .remove = spitzkbd_remove, + .remove = __devexit_p(spitzkbd_remove), .suspend = spitzkbd_suspend, .resume = spitzkbd_resume, .driver = { @@ -479,7 +479,7 @@ static struct platform_driver spitzkbd_driver = { }, }; -static int __devinit spitzkbd_init(void) +static int __init spitzkbd_init(void) { return platform_driver_register(&spitzkbd_driver); } |