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/envctrl.c | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index 3c27f45e2b6d..078e5f4520ef 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
| @@ -1027,7 +1027,7 @@ static int kenvctrld(void *__unused) | |||
| 1027 | return 0; | 1027 | return 0; |
| 1028 | } | 1028 | } |
| 1029 | 1029 | ||
| 1030 | static int __devinit envctrl_probe(struct of_device *op, | 1030 | static int __devinit envctrl_probe(struct platform_device *op, |
| 1031 | const struct of_device_id *match) | 1031 | const struct of_device_id *match) |
| 1032 | { | 1032 | { |
| 1033 | struct device_node *dp; | 1033 | struct device_node *dp; |
| @@ -1104,7 +1104,7 @@ out_iounmap: | |||
| 1104 | return err; | 1104 | return err; |
| 1105 | } | 1105 | } |
| 1106 | 1106 | ||
| 1107 | static int __devexit envctrl_remove(struct of_device *op) | 1107 | static int __devexit envctrl_remove(struct platform_device *op) |
| 1108 | { | 1108 | { |
| 1109 | int index; | 1109 | int index; |
| 1110 | 1110 | ||