diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-11 03:36:51 -0400 |
| commit | 6396fc3b3ff3f6b942992b653a62df11dcef9bea (patch) | |
| tree | db3c7cbe833b43c653adc99f70941431c5ff7c4e /drivers/power/olpc_battery.c | |
| parent | 4785879e4d340e24e54f6de2ccfc42728b912808 (diff) | |
| parent | 3d30701b58970425e1d45994d6cb82f828924fdd (diff) | |
Merge branch 'master' into for-next
Conflicts:
fs/exofs/inode.c
Diffstat (limited to 'drivers/power/olpc_battery.c')
| -rw-r--r-- | drivers/power/olpc_battery.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/power/olpc_battery.c b/drivers/power/olpc_battery.c index baefcf1cffc9..5ab9109b69e6 100644 --- a/drivers/power/olpc_battery.c +++ b/drivers/power/olpc_battery.c | |||
| @@ -384,7 +384,6 @@ static struct bin_attribute olpc_bat_eeprom = { | |||
| 384 | .attr = { | 384 | .attr = { |
| 385 | .name = "eeprom", | 385 | .name = "eeprom", |
| 386 | .mode = S_IRUGO, | 386 | .mode = S_IRUGO, |
| 387 | .owner = THIS_MODULE, | ||
| 388 | }, | 387 | }, |
| 389 | .size = 0, | 388 | .size = 0, |
| 390 | .read = olpc_bat_eeprom_read, | 389 | .read = olpc_bat_eeprom_read, |