diff options
author | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
---|---|---|
committer | Tony Lindgren | 2012-11-09 23:58:01 +0100 |
commit | edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch) | |
tree | 61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/m68k/include/uapi/asm/ioctls.h | |
parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
parent | Linux 3.7-rc4 (diff) | |
download | kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip |
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
Diffstat (limited to 'arch/m68k/include/uapi/asm/ioctls.h')
-rw-r--r-- | arch/m68k/include/uapi/asm/ioctls.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/m68k/include/uapi/asm/ioctls.h b/arch/m68k/include/uapi/asm/ioctls.h new file mode 100644 index 000000000000..1332bb4ca5b0 --- /dev/null +++ b/arch/m68k/include/uapi/asm/ioctls.h @@ -0,0 +1,8 @@ +#ifndef __ARCH_M68K_IOCTLS_H__ +#define __ARCH_M68K_IOCTLS_H__ + +#define FIOQSIZE 0x545E + +#include <asm-generic/ioctls.h> + +#endif /* __ARCH_M68K_IOCTLS_H__ */ |