diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /arch/arm/kernel/armksyms.c | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'arch/arm/kernel/armksyms.c')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index cc7b246e9652..2357b1cf1cf9 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c | |||
| @@ -13,11 +13,11 @@ | |||
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/in6.h> | 14 | #include <linux/in6.h> |
| 15 | #include <linux/syscalls.h> | 15 | #include <linux/syscalls.h> |
| 16 | #include <linux/uaccess.h> | ||
| 17 | #include <linux/io.h> | ||
| 16 | 18 | ||
| 17 | #include <asm/checksum.h> | 19 | #include <asm/checksum.h> |
| 18 | #include <asm/io.h> | ||
| 19 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 20 | #include <asm/uaccess.h> | ||
| 21 | #include <asm/ftrace.h> | 21 | #include <asm/ftrace.h> |
| 22 | 22 | ||
| 23 | /* | 23 | /* |