diff options
| author | Jean Delvare <khali@linux-fr.org> | 2007-05-04 01:35:12 +0200 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2007-05-04 01:35:12 +0200 |
| commit | 76e01e5bc0f958d7065d589ada7ca44eb44d8d3e (patch) | |
| tree | ee6013fae1b20db2c490b8fc8cb808909dc31a23 /drivers | |
| parent | c5807ace66d5085ed94608a7e9a084085ea57ede (diff) | |
| download | linux-stable-76e01e5bc0f958d7065d589ada7ca44eb44d8d3e.tar.gz linux-stable-76e01e5bc0f958d7065d589ada7ca44eb44d8d3e.tar.bz2 linux-stable-76e01e5bc0f958d7065d589ada7ca44eb44d8d3e.zip | |
hwmon/w83627ehf: Don't redefine REGION_OFFSET
On ia64, kernel headers define REGION_OFFSET so we can't use that.
Reported by Andrew Morton.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 92c65e74b58e..711933dbceb2 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c @@ -105,9 +105,9 @@ superio_exit(void) * ISA constants */ -#define REGION_ALIGNMENT ~7 -#define REGION_OFFSET 5 -#define REGION_LENGTH 2 +#define IOREGION_ALIGNMENT ~7 +#define IOREGION_OFFSET 5 +#define IOREGION_LENGTH 2 #define ADDR_REG_OFFSET 5 #define DATA_REG_OFFSET 6 @@ -675,7 +675,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) struct w83627ehf_data *data; int i, err = 0; - if (!request_region(address + REGION_OFFSET, REGION_LENGTH, + if (!request_region(address + IOREGION_OFFSET, IOREGION_LENGTH, w83627ehf_driver.driver.name)) { err = -EBUSY; goto exit; @@ -764,7 +764,7 @@ exit_detach: exit_free: kfree(data); exit_release: - release_region(address + REGION_OFFSET, REGION_LENGTH); + release_region(address + IOREGION_OFFSET, IOREGION_LENGTH); exit: return err; } @@ -778,7 +778,7 @@ static int w83627ehf_detach_client(struct i2c_client *client) if ((err = i2c_detach_client(client))) return err; - release_region(client->addr + REGION_OFFSET, REGION_LENGTH); + release_region(client->addr + IOREGION_OFFSET, IOREGION_LENGTH); kfree(data); return 0; @@ -811,7 +811,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr) superio_select(W83627EHF_LD_HWM); val = (superio_inb(SIO_REG_ADDR) << 8) | superio_inb(SIO_REG_ADDR + 1); - *addr = val & REGION_ALIGNMENT; + *addr = val & IOREGION_ALIGNMENT; if (*addr == 0) { superio_exit(); return -ENODEV; |