diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /include/acpi/platform/aclinux.h | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'include/acpi/platform/aclinux.h')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 2ce1be9f6291..f72403c4b51a 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h | |||
| @@ -59,7 +59,7 @@ | |||
| 59 | #include <linux/ctype.h> | 59 | #include <linux/ctype.h> |
| 60 | #include <linux/sched.h> | 60 | #include <linux/sched.h> |
| 61 | #include <asm/system.h> | 61 | #include <asm/system.h> |
| 62 | #include <asm/atomic.h> | 62 | #include <linux/atomic.h> |
| 63 | #include <asm/div64.h> | 63 | #include <asm/div64.h> |
| 64 | #include <asm/acpi.h> | 64 | #include <asm/acpi.h> |
| 65 | #include <linux/slab.h> | 65 | #include <linux/slab.h> |