Merge bk://kernel.bkbits.net/davem/sparc-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
0eaa6e8a · Linus Torvalds · aa7c5aa0 · 5435f08f · 0eaa6e8a
Commit 0eaa6e8a authored Apr 26, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

include/linux/compat_ioctl.h include/linux/compat_ioctl.h +1 -0

No files found.
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
@@ -73,6 +73,7 @@ COMPATIBLE_IOCTL(HDIO_SET_NOWERR)
 COMPATIBLE_IOCTL(HDIO_SET_32BIT)
 COMPATIBLE_IOCTL(HDIO_SET_MULTCOUNT)
 COMPATIBLE_IOCTL(HDIO_DRIVE_CMD)
+COMPATIBLE_IOCTL(HDIO_DRIVE_TASK)
 COMPATIBLE_IOCTL(HDIO_SET_PIO_MODE)
 COMPATIBLE_IOCTL(HDIO_SET_NICE)
 /* 0x02 -- Floppy ioctls */