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/sbs.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/sbs.c')
| -rw-r--r-- | drivers/acpi/sbs.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index bb8fd1b6054b..4b214b74ebaa 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
| @@ -493,7 +493,6 @@ acpi_sbs_add_fs(struct proc_dir_entry **dir, | |||
| 493 | if (!*dir) { | 493 | if (!*dir) { |
| 494 | return -ENODEV; | 494 | return -ENODEV; |
| 495 | } | 495 | } |
| 496 | (*dir)->owner = THIS_MODULE; | ||
| 497 | } | 496 | } |
| 498 | 497 | ||
| 499 | /* 'info' [R] */ | 498 | /* 'info' [R] */ |