diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /include/linux/capi.h | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
Diffstat (limited to 'include/linux/capi.h')
| -rw-r--r-- | include/linux/capi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/capi.h b/include/linux/capi.h index fdebaaa9f66e..65100d6cb89b 100644 --- a/include/linux/capi.h +++ b/include/linux/capi.h | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | #ifndef __LINUX_CAPI_H__ | 12 | #ifndef __LINUX_CAPI_H__ |
| 13 | #define __LINUX_CAPI_H__ | 13 | #define __LINUX_CAPI_H__ |
| 14 | 14 | ||
| 15 | #include <asm/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/ioctl.h> | 16 | #include <linux/ioctl.h> |
| 17 | #ifndef __KERNEL__ | 17 | #ifndef __KERNEL__ |
| 18 | #include <linux/kernelcapi.h> | 18 | #include <linux/kernelcapi.h> |