diff options
| author | James Morris <jmorris@namei.org> | 2008-11-06 07:12:34 +0800 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-06 07:12:34 +0800 |
| commit | e21e696edb498c7f7eed42ba3096f6bbe13927b6 (patch) | |
| tree | 73b0bc28e45b0268f05c4b384a17bfb2140a73bc /arch/cris/include/asm/ioctl.h | |
| parent | 2f99db28af90957271a6448479c3e492ccf7c697 (diff) | |
| parent | 75fa67706cce5272bcfc51ed646f2da21f3bdb6e (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'arch/cris/include/asm/ioctl.h')
| -rw-r--r-- | arch/cris/include/asm/ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/ioctl.h b/arch/cris/include/asm/ioctl.h new file mode 100644 index 000000000000..b279fe06dfe5 --- /dev/null +++ b/arch/cris/include/asm/ioctl.h @@ -0,0 +1 @@ +#include <asm-generic/ioctl.h> |