diff options
| author | Len Brown <len.brown@intel.com> | 2009-12-16 14:22:32 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-16 14:22:32 -0500 |
| commit | aa96ce0af8385415a3450bc13e6254a4d6b4a888 (patch) | |
| tree | 5d255bc416d469b4d2110910586c43fc6474d51e /drivers/acpi/processor_core.c | |
| parent | 2900681b25d5a1a1a7b39ab66da3b8c6b1b0b7ad (diff) | |
| parent | bf8b4542f92c4d8222941b1cab055fa350ab2fb4 (diff) | |
| download | linux-aa96ce0af8385415a3450bc13e6254a4d6b4a888.tar.gz | |
Merge branch 'misc-2.6.33' into release
Diffstat (limited to 'drivers/acpi/processor_core.c')
| -rw-r--r-- | drivers/acpi/processor_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 65b9f29ef10b2..41731236f9a1a 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -353,7 +353,7 @@ static int acpi_processor_info_open_fs(struct inode *inode, struct file *file) PDE(inode)->data); } -static int acpi_processor_add_fs(struct acpi_device *device) +static int __cpuinit acpi_processor_add_fs(struct acpi_device *device) { struct proc_dir_entry *entry = NULL; @@ -845,7 +845,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) goto err_power_exit; } - dev_info(&device->dev, "registered as cooling_device%d\n", + dev_dbg(&device->dev, "registered as cooling_device%d\n", pr->cdev->id); result = sysfs_create_link(&device->dev.kobj, |