diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 13:45:24 -0400 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /drivers/acpi/atomicio.c | |
| parent | ef06f55a5c936a395f3ee2e1237bbebdb4396c65 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/acpi/atomicio.c')
| -rw-r--r-- | drivers/acpi/atomicio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/atomicio.c b/drivers/acpi/atomicio.c index 814b19249616..8f8bd736d4ff 100644 --- a/drivers/acpi/atomicio.c +++ b/drivers/acpi/atomicio.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/kref.h> | 31 | #include <linux/kref.h> |
| 32 | #include <linux/rculist.h> | 32 | #include <linux/rculist.h> |
| 33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <acpi/atomicio.h> | 35 | #include <acpi/atomicio.h> |
| 35 | 36 | ||
| 36 | #define ACPI_PFX "ACPI: " | 37 | #define ACPI_PFX "ACPI: " |