diff options
| author | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-04-05 02:14:15 -0400 |
| commit | 478c6a43fcbc6c11609f8cee7c7b57223907754f (patch) | |
| tree | a7f7952099da60d33032aed6de9c0c56c9f8779e /drivers/acpi/battery.c | |
| parent | 8a3f257c704e02aee9869decd069a806b45be3f1 (diff) | |
| parent | 6bb597507f9839b13498781e481f5458aea33620 (diff) | |
Merge branch 'linus' into release
Conflicts:
arch/x86/kernel/cpu/cpufreq/longhaul.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 2abc03668627..b0de6312919a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -763,7 +763,6 @@ static int acpi_battery_add_fs(struct acpi_device *device) | |||
| 763 | acpi_battery_dir); | 763 | acpi_battery_dir); |
| 764 | if (!acpi_device_dir(device)) | 764 | if (!acpi_device_dir(device)) |
| 765 | return -ENODEV; | 765 | return -ENODEV; |
| 766 | acpi_device_dir(device)->owner = THIS_MODULE; | ||
| 767 | } | 766 | } |
| 768 | 767 | ||
| 769 | for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) { | 768 | for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) { |