summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-23 18:46:25 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-01-23 18:46:25 -0800
commit4784b11c4f49eb88f2dd74df6afc5170f193cedc (patch)
treee616eea0139dbd67f56b24b14261a95aa9b35b27 /drivers
parent94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (diff)
parent872e2be7c4056496c2871bd9b0f2fae6c374fe47 (diff)
downloadop-kernel-dev-4784b11c4f49eb88f2dd74df6afc5170f193cedc.zip
op-kernel-dev-4784b11c4f49eb88f2dd74df6afc5170f193cedc.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC]: Constify function pointer tables. [SPARC64]: Fix section error in sparcspkr [SPARC64]: Fix of section mismatch warnings.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/input/misc/sparcspkr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index a3637d8..fed3c37 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -195,7 +195,7 @@ static struct of_platform_driver ebus_beep_driver = {
.name = "beep",
.match_table = ebus_beep_match,
.probe = ebus_beep_probe,
- .remove = sparcspkr_remove,
+ .remove = __devexit_p(sparcspkr_remove),
.shutdown = sparcspkr_shutdown,
};
@@ -236,7 +236,7 @@ static struct of_platform_driver isa_beep_driver = {
.name = "beep",
.match_table = isa_beep_match,
.probe = isa_beep_probe,
- .remove = sparcspkr_remove,
+ .remove = __devexit_p(sparcspkr_remove),
.shutdown = sparcspkr_shutdown,
};
OpenPOWER on IntegriCloud