summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2011-02-14 12:11:43 -0600
committerJustin M. Forbes <jforbes@redhat.com>2011-02-14 12:11:43 -0600
commit9de12c453d62f7f9bc2a2b47ecea20c8d8ee8836 (patch)
tree4ee7eff1655a443da744d75f08a5993119229f4b
parentc7e9df3bc6bf0cad74081c7492b5aab753bf9cc9 (diff)
parenteee37d310c1e53698e317e76db53c63f6bf62af0 (diff)
downloadqemu-9de12c453d62f7f9bc2a2b47ecea20c8d8ee8836.tar.gz
Merge branch 'linux-user-for-0.14' of git://gitorious.org/qemu-maemo/qemu
-rw-r--r--linux-user/ioctls.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
index acff781081..526aaa2a76 100644
--- a/linux-user/ioctls.h
+++ b/linux-user/ioctls.h
@@ -312,10 +312,8 @@
IOCTL(LOOP_CLR_FD, 0, TYPE_INT)
IOCTL(LOOP_SET_STATUS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info)))
IOCTL(LOOP_GET_STATUS, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info)))
-#if 0 /* These have some problems - not fully tested */
IOCTL(LOOP_SET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
IOCTL(LOOP_GET_STATUS64, IOC_W, MK_PTR(MK_STRUCT(STRUCT_loop_info64)))
-#endif
IOCTL(LOOP_CHANGE_FD, 0, TYPE_INT)
IOCTL(MTIOCTOP, IOC_W, MK_PTR(MK_STRUCT(STRUCT_mtop)))