diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-03 03:14:09 -0400 |
| commit | 27b030d58c8e72fc7a95187a791bd9406e350f02 (patch) | |
| tree | ab3bab7f39a5ce5bab65578a7e08fa4dfdeb198c /drivers/acpi/scan.c | |
| parent | 79d20b14a0d651f15b0ef9a22b6cf12d284a6d38 (diff) | |
| parent | 6628465e33ca694bd8fd5c3cf4eb7ff9177bc694 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index e7ca06626566..119c94093a13 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -379,8 +379,8 @@ ACPI_DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store); | |||
| 379 | 379 | ||
| 380 | /** | 380 | /** |
| 381 | * setup_sys_fs_device_files - sets up the device files under device namespace | 381 | * setup_sys_fs_device_files - sets up the device files under device namespace |
| 382 | * @@dev: acpi_device object | 382 | * @dev: acpi_device object |
| 383 | * @@func: function pointer to create or destroy the device file | 383 | * @func: function pointer to create or destroy the device file |
| 384 | */ | 384 | */ |
| 385 | static void | 385 | static void |
| 386 | setup_sys_fs_device_files ( | 386 | setup_sys_fs_device_files ( |