aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 14:31:52 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 14:31:52 -0500
commit57c44c5f6fb0a8002feb258c1af58e1a744b1fcb (patch)
tree978bd46ca765a88e9c101cb705bbb0bf46015643 /drivers/acpi
parent76052749143d03006271cc0ce8205ad756917062 (diff)
parent5a9e67b1a19e08a82387709f325d26e07b891d27 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) trivial: chack -> check typo fix in main Makefile trivial: Add a space (and a comma) to a printk in 8250 driver trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx trivial: Fix misspelling of "firmware" in powerpc Makefile trivial: Fix misspelling of "firmware" in usb.c trivial: Fix misspelling of "firmware" in qla1280.c trivial: Fix misspelling of "firmware" in a100u2w.c trivial: Fix misspelling of "firmware" in megaraid.c trivial: Fix misspelling of "firmware" in ql4_mbx.c trivial: Fix misspelling of "firmware" in acpi_memhotplug.c trivial: Fix misspelling of "firmware" in ipw2100.c trivial: Fix misspelling of "firmware" in atmel.c trivial: Fix misspelled firmware in Kconfig trivial: fix an -> a typos in documentation and comments trivial: fix then -> than typos in comments and documentation trivial: update Jesper Juhl CREDITS entry with new email trivial: fix singal -> signal typo trivial: Fix incorrect use of "loose" in event.c trivial: printk: fix indentation of new_text_line declaration trivial: rtc-stk17ta8: fix sparse warning ...
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpi_memhotplug.c2
-rw-r--r--drivers/acpi/executer/exprep.c2
-rw-r--r--drivers/acpi/executer/exresolv.c2
-rw-r--r--drivers/acpi/executer/exstore.c2
-rw-r--r--drivers/acpi/resources/rscreate.c2
-rw-r--r--drivers/acpi/utilities/utobject.c4
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 63a17b55b39b..7a0f4aa4fa1e 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -20,7 +20,7 @@
20 * 20 *
21 * 21 *
22 * ACPI based HotPlug driver that supports Memory Hotplug 22 * ACPI based HotPlug driver that supports Memory Hotplug
23 * This driver fields notifications from firmare for memory add 23 * This driver fields notifications from firmware for memory add
24 * and remove operations and alerts the VM of the affected memory 24 * and remove operations and alerts the VM of the affected memory
25 * ranges. 25 * ranges.
26 */ 26 */
diff --git a/drivers/acpi/executer/exprep.c b/drivers/acpi/executer/exprep.c
index 5d438c32989d..a7dc87ecee37 100644
--- a/drivers/acpi/executer/exprep.c
+++ b/drivers/acpi/executer/exprep.c
@@ -404,7 +404,7 @@ acpi_ex_prep_common_field_object(union acpi_operand_object *obj_desc,
404 * 404 *
405 * RETURN: Status 405 * RETURN: Status
406 * 406 *
407 * DESCRIPTION: Construct an union acpi_operand_object of type def_field and 407 * DESCRIPTION: Construct a union acpi_operand_object of type def_field and
408 * connect it to the parent Node. 408 * connect it to the parent Node.
409 * 409 *
410 ******************************************************************************/ 410 ******************************************************************************/
diff --git a/drivers/acpi/executer/exresolv.c b/drivers/acpi/executer/exresolv.c
index 89571b92a522..60e8c47128e9 100644
--- a/drivers/acpi/executer/exresolv.c
+++ b/drivers/acpi/executer/exresolv.c
@@ -146,7 +146,7 @@ acpi_ex_resolve_object_to_value(union acpi_operand_object **stack_ptr,
146 146
147 stack_desc = *stack_ptr; 147 stack_desc = *stack_ptr;
148 148
149 /* This is an union acpi_operand_object */ 149 /* This is a union acpi_operand_object */
150 150
151 switch (ACPI_GET_OBJECT_TYPE(stack_desc)) { 151 switch (ACPI_GET_OBJECT_TYPE(stack_desc)) {
152 case ACPI_TYPE_LOCAL_REFERENCE: 152 case ACPI_TYPE_LOCAL_REFERENCE:
diff --git a/drivers/acpi/executer/exstore.c b/drivers/acpi/executer/exstore.c
index 3318df4cbd98..1c118ba78adb 100644
--- a/drivers/acpi/executer/exstore.c
+++ b/drivers/acpi/executer/exstore.c
@@ -274,7 +274,7 @@ acpi_ex_do_debug_object(union acpi_operand_object *source_desc,
274 * 274 *
275 * PARAMETERS: *source_desc - Value to be stored 275 * PARAMETERS: *source_desc - Value to be stored
276 * *dest_desc - Where to store it. Must be an NS node 276 * *dest_desc - Where to store it. Must be an NS node
277 * or an union acpi_operand_object of type 277 * or a union acpi_operand_object of type
278 * Reference; 278 * Reference;
279 * walk_state - Current walk state 279 * walk_state - Current walk state
280 * 280 *
diff --git a/drivers/acpi/resources/rscreate.c b/drivers/acpi/resources/rscreate.c
index c0bbfa2c4193..08b8d73e6ee5 100644
--- a/drivers/acpi/resources/rscreate.c
+++ b/drivers/acpi/resources/rscreate.c
@@ -124,7 +124,7 @@ acpi_rs_create_resource_list(union acpi_operand_object *aml_buffer,
124 * 124 *
125 * FUNCTION: acpi_rs_create_pci_routing_table 125 * FUNCTION: acpi_rs_create_pci_routing_table
126 * 126 *
127 * PARAMETERS: package_object - Pointer to an union acpi_operand_object 127 * PARAMETERS: package_object - Pointer to a union acpi_operand_object
128 * package 128 * package
129 * output_buffer - Pointer to the user's buffer 129 * output_buffer - Pointer to the user's buffer
130 * 130 *
diff --git a/drivers/acpi/utilities/utobject.c b/drivers/acpi/utilities/utobject.c
index c354e7a42bcd..4bef3cfbaccb 100644
--- a/drivers/acpi/utilities/utobject.c
+++ b/drivers/acpi/utilities/utobject.c
@@ -297,7 +297,7 @@ union acpi_operand_object *acpi_ut_create_string_object(acpi_size string_size)
297 * 297 *
298 * RETURN: TRUE if object is valid, FALSE otherwise 298 * RETURN: TRUE if object is valid, FALSE otherwise
299 * 299 *
300 * DESCRIPTION: Validate a pointer to be an union acpi_operand_object 300 * DESCRIPTION: Validate a pointer to be a union acpi_operand_object
301 * 301 *
302 ******************************************************************************/ 302 ******************************************************************************/
303 303
@@ -389,7 +389,7 @@ void acpi_ut_delete_object_desc(union acpi_operand_object *object)
389{ 389{
390 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object); 390 ACPI_FUNCTION_TRACE_PTR(ut_delete_object_desc, object);
391 391
392 /* Object must be an union acpi_operand_object */ 392 /* Object must be a union acpi_operand_object */
393 393
394 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) { 394 if (ACPI_GET_DESCRIPTOR_TYPE(object) != ACPI_DESC_TYPE_OPERAND) {
395 ACPI_ERROR((AE_INFO, 395 ACPI_ERROR((AE_INFO,