diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/uapi/linux/unistd.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/uapi/linux/unistd.h')
| -rw-r--r-- | include/uapi/linux/unistd.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/uapi/linux/unistd.h b/include/uapi/linux/unistd.h new file mode 100644 index 000000000000..aa8d5b5e2e3e --- /dev/null +++ b/include/uapi/linux/unistd.h | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | #ifndef _LINUX_UNISTD_H_ | ||
| 2 | #define _LINUX_UNISTD_H_ | ||
| 3 | |||
| 4 | /* | ||
| 5 | * Include machine specific syscall numbers | ||
| 6 | */ | ||
| 7 | #include <asm/unistd.h> | ||
| 8 | |||
| 9 | #endif /* _LINUX_UNISTD_H_ */ | ||