diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /drivers/acpi/container.c | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/acpi/container.c')
| -rw-r--r-- | drivers/acpi/container.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 134818b265a9..17020c12623c 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #define INSTALL_NOTIFY_HANDLER 1 | 41 | #define INSTALL_NOTIFY_HANDLER 1 |
| 42 | #define UNINSTALL_NOTIFY_HANDLER 2 | 42 | #define UNINSTALL_NOTIFY_HANDLER 2 |
| 43 | 43 | ||
| 44 | #define ACPI_CONTAINER_COMPONENT 0x01000000 | ||
| 45 | #define _COMPONENT ACPI_CONTAINER_COMPONENT | 44 | #define _COMPONENT ACPI_CONTAINER_COMPONENT |
| 46 | ACPI_MODULE_NAME("container"); | 45 | ACPI_MODULE_NAME("container"); |
| 47 | 46 | ||