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/proc.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/acpi/proc.c')
| -rw-r--r-- | drivers/acpi/proc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c index f5f986991b52..251c7b6273a9 100644 --- a/drivers/acpi/proc.c +++ b/drivers/acpi/proc.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/proc_fs.h> | 1 | #include <linux/proc_fs.h> |
| 2 | #include <linux/seq_file.h> | 2 | #include <linux/seq_file.h> |
| 3 | #include <linux/export.h> | ||
| 3 | #include <linux/suspend.h> | 4 | #include <linux/suspend.h> |
| 4 | #include <linux/bcd.h> | 5 | #include <linux/bcd.h> |
| 5 | #include <asm/uaccess.h> | 6 | #include <asm/uaccess.h> |