diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 09:11:31 -0700 |
| commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
| tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/hwmon | |
| parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
| parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) | |
| download | linux-58d4ea65b98f154f3326b038eecda32f90b46ea8.tar.bz2 | |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/ams/ams.h | 2 | ||||
| -rw-r--r-- | drivers/hwmon/ultra45_env.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/ams/ams.h b/drivers/hwmon/ams/ams.h index b28d7e27a031..90f094d45450 100644 --- a/drivers/hwmon/ams/ams.h +++ b/drivers/hwmon/ams/ams.h @@ -23,7 +23,7 @@ struct ams { /* General properties */ struct device_node *of_node; - struct of_device *of_dev; + struct platform_device *of_dev; char has_device; char vflag; u32 orient1; diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c index 89643261ccdb..d863e13a50b8 100644 --- a/drivers/hwmon/ultra45_env.c +++ b/drivers/hwmon/ultra45_env.c @@ -234,7 +234,7 @@ static const struct attribute_group env_group = { .attrs = env_attributes, }; -static int __devinit env_probe(struct of_device *op, +static int __devinit env_probe(struct platform_device *op, const struct of_device_id *match) { struct env *p = kzalloc(sizeof(*p), GFP_KERNEL); @@ -276,7 +276,7 @@ out_free: goto out; } -static int __devexit env_remove(struct of_device *op) +static int __devexit env_remove(struct platform_device *op) { struct env *p = dev_get_drvdata(&op->dev); |