lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'misc-2.6.33' into release

Browse Source
This commit is contained in:
Len Brown
2009-12-16 14:22:32 -05:00
parent 2900681b25 bf8b4542f9
commit aa96ce0af8
10 changed files with 60 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/processor_core.c
View File

@ -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,