projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
watchdog
/
cpwd.c
diff --git
a/drivers/watchdog/cpwd.c
b/drivers/watchdog/cpwd.c
index 30a2512fd52e30fef23cdac728eae59d4b3803af..566343b3c131fc3f6d3ce17b6bc7bd1e2c724ac4 100644
(file)
--- a/
drivers/watchdog/cpwd.c
+++ b/
drivers/watchdog/cpwd.c
@@
-526,7
+526,7
@@
static const struct file_operations cpwd_fops = {
.release = cpwd_release,
};
.release = cpwd_release,
};
-static int __devinit cpwd_probe(struct
of
_device *op,
+static int __devinit cpwd_probe(struct
platform
_device *op,
const struct of_device_id *match)
{
struct device_node *options;
const struct of_device_id *match)
{
struct device_node *options;
@@
-639,7
+639,7
@@
out_free:
goto out;
}
goto out;
}
-static int __devexit cpwd_remove(struct
of
_device *op)
+static int __devexit cpwd_remove(struct
platform
_device *op)
{
struct cpwd *p = dev_get_drvdata(&op->dev);
int i;
{
struct cpwd *p = dev_get_drvdata(&op->dev);
int i;