diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 07:47:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-10 07:47:13 -0700 |
commit | 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b (patch) | |
tree | cc9cc1f5df8845471894010e625e130d111262a7 /arch/frv/include/asm/ioctl.h | |
parent | 6594d0b1cdfd9058f5b766e490ea1c94ae5e0ed4 (diff) | |
parent | e69cc9278831139660cb99bde52908f145338d77 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv
* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
FRV: Move to arch/frv/include/asm/
FRV: Fix indentation errors to keep git-am happy when moving arch header files
Diffstat (limited to 'arch/frv/include/asm/ioctl.h')
-rw-r--r-- | arch/frv/include/asm/ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/frv/include/asm/ioctl.h b/arch/frv/include/asm/ioctl.h new file mode 100644 index 00000000000..b279fe06dfe --- /dev/null +++ b/arch/frv/include/asm/ioctl.h @@ -0,0 +1 @@ +#include <asm-generic/ioctl.h> |