diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /drivers/acpi/processor_core.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/acpi/processor_core.c')
| -rw-r--r-- | drivers/acpi/processor_core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 02d2a4c9084d..3a0428e8435c 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> | 7 | * Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> |
| 8 | * - Added _PDC for platforms with Intel CPUs | 8 | * - Added _PDC for platforms with Intel CPUs |
| 9 | */ | 9 | */ |
| 10 | #include <linux/export.h> | ||
| 10 | #include <linux/dmi.h> | 11 | #include <linux/dmi.h> |
| 11 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 12 | 13 | ||