diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-16 13:30:09 +0300 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-10-16 13:30:09 +0300 |
| commit | e7d9facf0bab6d919342fea17c8cc0f65f8a0fe9 (patch) | |
| tree | 8301035b4dcb273c211c04fe2c0d1cbaf897021b /include/uapi/linux/ioctl.h | |
| parent | 28bcd199cc4465733c1ac0c70135a385fff97c71 (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
Merge tag 'v3.7-rc1'
Merge Linux 3.7-rc1 to get latest upstream changes.
Diffstat (limited to 'include/uapi/linux/ioctl.h')
| -rw-r--r-- | include/uapi/linux/ioctl.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/ioctl.h b/include/uapi/linux/ioctl.h new file mode 100644 index 000000000000..aa91eb3951ef --- /dev/null +++ b/include/uapi/linux/ioctl.h @@ -0,0 +1,7 @@ +#ifndef _LINUX_IOCTL_H +#define _LINUX_IOCTL_H + +#include <asm/ioctl.h> + +#endif /* _LINUX_IOCTL_H */ + |