diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 21:46:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 21:46:25 -0500 |
| commit | 4784b11c4f49eb88f2dd74df6afc5170f193cedc (patch) | |
| tree | e616eea0139dbd67f56b24b14261a95aa9b35b27 /drivers | |
| parent | 94f5a00d7c37ef8a3f85f8ea29903d4bf2291664 (diff) | |
| parent | 872e2be7c4056496c2871bd9b0f2fae6c374fe47 (diff) | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c index a3637d870880..fed3c375ccf3 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 = { | |||
| 195 | .name = "beep", | 195 | .name = "beep", |
| 196 | .match_table = ebus_beep_match, | 196 | .match_table = ebus_beep_match, |
| 197 | .probe = ebus_beep_probe, | 197 | .probe = ebus_beep_probe, |
| 198 | .remove = sparcspkr_remove, | 198 | .remove = __devexit_p(sparcspkr_remove), |
| 199 | .shutdown = sparcspkr_shutdown, | 199 | .shutdown = sparcspkr_shutdown, |
| 200 | }; | 200 | }; |
| 201 | 201 | ||
| @@ -236,7 +236,7 @@ static struct of_platform_driver isa_beep_driver = { | |||
| 236 | .name = "beep", | 236 | .name = "beep", |
| 237 | .match_table = isa_beep_match, | 237 | .match_table = isa_beep_match, |
| 238 | .probe = isa_beep_probe, | 238 | .probe = isa_beep_probe, |
| 239 | .remove = sparcspkr_remove, | 239 | .remove = __devexit_p(sparcspkr_remove), |
| 240 | .shutdown = sparcspkr_shutdown, | 240 | .shutdown = sparcspkr_shutdown, |
| 241 | }; | 241 | }; |
| 242 | 242 | ||