diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 05:00:07 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 05:00:07 -0500 |
| commit | c1b2dab96f3c1cb051b85d82d7e70e12e9b930f2 (patch) | |
| tree | 9ef312cd3b4ce583364923ad708168add6059285 /drivers/acpi/ac.c | |
| parent | 6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 (diff) | |
| parent | 6d855fcdd24d2491455527c4999b4d04363f1980 (diff) | |
Merge branch 'procfs-cleanup' into release
Diffstat (limited to 'drivers/acpi/ac.c')
| -rw-r--r-- | drivers/acpi/ac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 25d3aaebc10d..58c3f74bd84c 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
| @@ -197,7 +197,8 @@ static int acpi_ac_add_fs(struct acpi_device *device) | |||
| 197 | { | 197 | { |
| 198 | struct proc_dir_entry *entry = NULL; | 198 | struct proc_dir_entry *entry = NULL; |
| 199 | 199 | ||
| 200 | 200 | printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded," | |
| 201 | " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n"); | ||
| 201 | if (!acpi_device_dir(device)) { | 202 | if (!acpi_device_dir(device)) { |
| 202 | acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), | 203 | acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device), |
| 203 | acpi_ac_dir); | 204 | acpi_ac_dir); |