diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /drivers/sbus/char/flash.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/sbus/char/flash.c')
| -rw-r--r-- | drivers/sbus/char/flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 8bb31c584b64..2b4b4b613c48 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
| @@ -160,7 +160,7 @@ static const struct file_operations flash_fops = { | |||
| 160 | 160 | ||
| 161 | static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; | 161 | static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops }; |
| 162 | 162 | ||
| 163 | static int __devinit flash_probe(struct of_device *op, | 163 | static int __devinit flash_probe(struct platform_device *op, |
| 164 | const struct of_device_id *match) | 164 | const struct of_device_id *match) |
| 165 | { | 165 | { |
| 166 | struct device_node *dp = op->dev.of_node; | 166 | struct device_node *dp = op->dev.of_node; |
| @@ -192,7 +192,7 @@ static int __devinit flash_probe(struct of_device *op, | |||
| 192 | return misc_register(&flash_dev); | 192 | return misc_register(&flash_dev); |
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | static int __devexit flash_remove(struct of_device *op) | 195 | static int __devexit flash_remove(struct platform_device *op) |
| 196 | { | 196 | { |
| 197 | misc_deregister(&flash_dev); | 197 | misc_deregister(&flash_dev); |
| 198 | 198 | ||