projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into release
[linux-2.6-block.git]
/
include
/
acpi
/
actypes.h
diff --git
a/include/acpi/actypes.h
b/include/acpi/actypes.h
index 03744d28dcf6ed660fc3453244ac05276dc9f9f9..a20aab5101739e75e8ea983d23f5a0cdd6c695a1 100644
(file)
--- a/
include/acpi/actypes.h
+++ b/
include/acpi/actypes.h
@@
-604,7
+604,7
@@
typedef u32 acpi_object_type;
/*
* These are special object types that never appear in
- * a Namespace node, only in a
n
union acpi_operand_object
+ * a Namespace node, only in a union acpi_operand_object
*/
#define ACPI_TYPE_LOCAL_EXTRA 0x1C
#define ACPI_TYPE_LOCAL_DATA 0x1D