diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 00:52:04 -0400 |
| commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
| tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /drivers/i2c/chips/ds1682.c | |
| parent | 84dfcb4b318463cd4883b6a19937824f49aee564 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'drivers/i2c/chips/ds1682.c')
| -rw-r--r-- | drivers/i2c/chips/ds1682.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/i2c/chips/ds1682.c b/drivers/i2c/chips/ds1682.c index 23be4d42cb02..f3ee4a1abb77 100644 --- a/drivers/i2c/chips/ds1682.c +++ b/drivers/i2c/chips/ds1682.c | |||
| @@ -190,7 +190,6 @@ static struct bin_attribute ds1682_eeprom_attr = { | |||
| 190 | .attr = { | 190 | .attr = { |
| 191 | .name = "eeprom", | 191 | .name = "eeprom", |
| 192 | .mode = S_IRUGO | S_IWUSR, | 192 | .mode = S_IRUGO | S_IWUSR, |
| 193 | .owner = THIS_MODULE, | ||
| 194 | }, | 193 | }, |
| 195 | .size = DS1682_EEPROM_SIZE, | 194 | .size = DS1682_EEPROM_SIZE, |
| 196 | .read = ds1682_eeprom_read, | 195 | .read = ds1682_eeprom_read, |