Merge nommu tree

[linux-2.6] / drivers / ieee1394 / ieee1394-ioctl.h

diff --git a/drivers/ieee1394/ieee1394-ioctl.h b/drivers/ieee1394/ieee1394-ioctl.h
index f92b566363d5ec33695024a9a93e7a426a1716cf..156703986348cddade654814eaa4de4ce465bcdb 100644 (file)
--- a/drivers/ieee1394/ieee1394-ioctl.h
+++ b/drivers/ieee1394/ieee1394-ioctl.h
@@ -7,14 +7,6 @@
 #include <linux/ioctl.h>
 #include <linux/types.h>
 
-
-/* AMDTP Gets 6 */
-#define AMDTP_IOC_CHANNEL      _IOW('#', 0x00, struct amdtp_ioctl)
-#define AMDTP_IOC_PLUG         _IOW('#', 0x01, struct amdtp_ioctl)
-#define AMDTP_IOC_PING         _IOW('#', 0x02, struct amdtp_ioctl)
-#define AMDTP_IOC_ZAP          _IO ('#', 0x03)
-
-
 /* DV1394 Gets 10 */
 
 /* Get the driver ready to transmit video.  pass a struct dv1394_init* as