diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 08:53:01 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-01 08:53:01 +0200 |
| commit | 48a7afe314bfc4d7f50e1608632f503dbba7e013 (patch) | |
| tree | 4a80e6b96321a71affd1bacea817de93be08894b /drivers/hwmon/ams/ams-i2c.c | |
| parent | [WATCHDOG] Semi-typical watchdog bug re early misc_register() (diff) | |
| parent | libata: honour host controllers that want just one host (diff) | |
| download | linux-48a7afe314bfc4d7f50e1608632f503dbba7e013.tar.xz linux-48a7afe314bfc4d7f50e1608632f503dbba7e013.zip | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/hwmon/ams/ams-i2c.c')
| -rw-r--r-- | drivers/hwmon/ams/ams-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c index 0d24bdfea53e..485d333bcb3e 100644 --- a/drivers/hwmon/ams/ams-i2c.c +++ b/drivers/hwmon/ams/ams-i2c.c @@ -263,7 +263,7 @@ int __init ams_i2c_init(struct device_node *np) { char *tmp_bus; int result; - u32 *prop; + const u32 *prop; mutex_lock(&ams_info.lock); @@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np) ams_info.bustype = BUS_I2C; /* look for bus either using "reg" or by path */ - prop = (u32*)get_property(ams_info.of_node, "reg", NULL); + prop = get_property(ams_info.of_node, "reg", NULL); if (!prop) { result = -ENODEV; |