diff options
| author | Linus Torvalds | 2005-06-21 01:00:33 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-21 01:00:33 +0200 |
| commit | 1d345dac1f30af1cd9f3a1faa12f9f18f17f236e (patch) | |
| tree | 42a7deda7589edf704fe60dc262046755bd3f6a8 /drivers/i2c/chips/gl520sm.c | |
| parent | Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | [PATCH] PCI: fix show_modalias() function due to attribute change (diff) | |
| download | kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.tar.gz kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.tar.xz kernel-qcow2-linux-1d345dac1f30af1cd9f3a1faa12f9f18f17f236e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
Diffstat (limited to 'drivers/i2c/chips/gl520sm.c')
| -rw-r--r-- | drivers/i2c/chips/gl520sm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/chips/gl520sm.c b/drivers/i2c/chips/gl520sm.c index 3fd17e46ffc6..a13a504f5bfa 100644 --- a/drivers/i2c/chips/gl520sm.c +++ b/drivers/i2c/chips/gl520sm.c @@ -148,8 +148,8 @@ struct gl520_data { #define sysfs_r(type, n, item, reg) \ static ssize_t get_##type##item (struct gl520_data *, char *, int); \ -static ssize_t get_##type##n##item (struct device *, char *); \ -static ssize_t get_##type##n##item (struct device *dev, char *buf) \ +static ssize_t get_##type##n##item (struct device *, struct device_attribute *attr, char *); \ +static ssize_t get_##type##n##item (struct device *dev, struct device_attribute *attr, char *buf) \ { \ struct gl520_data *data = gl520_update_device(dev); \ return get_##type##item(data, buf, (n)); \ @@ -157,8 +157,8 @@ static ssize_t get_##type##n##item (struct device *dev, char *buf) \ #define sysfs_w(type, n, item, reg) \ static ssize_t set_##type##item (struct i2c_client *, struct gl520_data *, const char *, size_t, int, int); \ -static ssize_t set_##type##n##item (struct device *, const char *, size_t); \ -static ssize_t set_##type##n##item (struct device *dev, const char *buf, size_t count) \ +static ssize_t set_##type##n##item (struct device *, struct device_attribute *attr, const char *, size_t); \ +static ssize_t set_##type##n##item (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) \ { \ struct i2c_client *client = to_i2c_client(dev); \ struct gl520_data *data = i2c_get_clientdata(client); \ |