diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:38:41 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-02-03 10:38:41 -0600 |
| commit | 6d2160bfe7826aca1c94b4bca77093908a452ae7 (patch) | |
| tree | 8153fcd8a7c467e5de136f312e8ef5b27bea9d6b /arch/m68k/include/asm/ioctl.h | |
| parent | f0e0059b9c18426cffdcc04161062251a8f9741e (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
Diffstat (limited to 'arch/m68k/include/asm/ioctl.h')
| -rw-r--r-- | arch/m68k/include/asm/ioctl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/ioctl.h b/arch/m68k/include/asm/ioctl.h new file mode 100644 index 00000000000..b279fe06dfe --- /dev/null +++ b/arch/m68k/include/asm/ioctl.h @@ -0,0 +1 @@ +#include <asm-generic/ioctl.h> |