diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/input/misc/sparcspkr.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/input/misc/sparcspkr.c')
| -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 c4f42311fdec..b064419b90a2 100644 --- a/drivers/input/misc/sparcspkr.c +++ b/drivers/input/misc/sparcspkr.c | |||
| @@ -230,7 +230,7 @@ out_err: | |||
| 230 | return err; | 230 | return err; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | static int bbc_remove(struct of_device *op) | 233 | static int __devexit bbc_remove(struct of_device *op) |
| 234 | { | 234 | { |
| 235 | struct sparcspkr_state *state = dev_get_drvdata(&op->dev); | 235 | struct sparcspkr_state *state = dev_get_drvdata(&op->dev); |
| 236 | struct input_dev *input_dev = state->input_dev; | 236 | struct input_dev *input_dev = state->input_dev; |
| @@ -308,7 +308,7 @@ out_err: | |||
| 308 | return err; | 308 | return err; |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | static int grover_remove(struct of_device *op) | 311 | static int __devexit grover_remove(struct of_device *op) |
| 312 | { | 312 | { |
| 313 | struct sparcspkr_state *state = dev_get_drvdata(&op->dev); | 313 | struct sparcspkr_state *state = dev_get_drvdata(&op->dev); |
| 314 | struct grover_beep_info *info = &state->u.grover; | 314 | struct grover_beep_info *info = &state->u.grover; |