3 files changed, 1 insertions, 54 deletions
diff --git a/include/uapi/sound/Kbuild b/include/uapi/sound/Kbuild
index a7f2770..0f7d279 100644
--- a/include/uapi/sound/Kbuild
+++ b/include/uapi/sound/Kbuild
@@ -5,7 +5,6 @@ header-y += asound_fm.h
 header-y += compress_offload.h
 header-y += compress_params.h
 header-y += emu10k1.h
-header-y += firewire.h
 header-y += hdsp.h
 header-y += hdspm.h
 header-y += sb16_csp.h
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h
index 9fc6219..041203f 100644
--- a/include/uapi/sound/asound.h
+++ b/include/uapi/sound/asound.h
@@ -93,10 +93,9 @@ enum {
 	SNDRV_HWDEP_IFACE_SB_RC,	/* SB Extigy/Audigy2NX remote control */
 	SNDRV_HWDEP_IFACE_HDA,		/* HD-audio */
 	SNDRV_HWDEP_IFACE_USB_STREAM,	/* direct access to usb stream */
-	SNDRV_HWDEP_IFACE_FW_DICE,	/* TC DICE FireWire device */
 
 	/* Don't forget to change the following: */
-	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_FW_DICE
+	SNDRV_HWDEP_IFACE_LAST = SNDRV_HWDEP_IFACE_USB_STREAM
 };
 
 struct snd_hwdep_info {
diff --git a/include/uapi/sound/firewire.h b/include/uapi/sound/firewire.h
deleted file mode 100644
index 59f5961..0000000
--- a/include/uapi/sound/firewire.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef _UAPI_SOUND_FIREWIRE_H_INCLUDED
-#define _UAPI_SOUND_FIREWIRE_H_INCLUDED
-
-#include <linux/ioctl.h>
-
-/* events can be read() from the hwdep device */
-
-#define SNDRV_FIREWIRE_EVENT_LOCK_STATUS	0x000010cc
-#define SNDRV_FIREWIRE_EVENT_DICE_NOTIFICATION	0xd1ce004e
-
-struct snd_firewire_event_common {
-	unsigned int type; /* SNDRV_FIREWIRE_EVENT_xxx */
-};
-
-struct snd_firewire_event_lock_status {
-	unsigned int type;
-	unsigned int status; /* 0/1 = unlocked/locked */
-};
-
-struct snd_firewire_event_dice_notification {
-	unsigned int type;
-	unsigned int notification; /* DICE-specific bits */
-};
-
-union snd_firewire_event {
-	struct snd_firewire_event_common            common;
-	struct snd_firewire_event_lock_status       lock_status;
-	struct snd_firewire_event_dice_notification dice_notification;
-};
-
-
-#define SNDRV_FIREWIRE_IOCTL_GET_INFO _IOR('H', 0xf8, struct snd_firewire_get_info)
-#define SNDRV_FIREWIRE_IOCTL_LOCK      _IO('H', 0xf9)
-#define SNDRV_FIREWIRE_IOCTL_UNLOCK    _IO('H', 0xfa)
-
-#define SNDRV_FIREWIRE_TYPE_DICE	1
-/* Fireworks, AV/C, RME, MOTU, ... */
-
-struct snd_firewire_get_info {
-	unsigned int type; /* SNDRV_FIREWIRE_TYPE_xxx */
-	unsigned int card; /* same as fw_cdev_get_info.card */
-	unsigned char guid[8];
-	char device_name[16]; /* device node in /dev */
-};
-
-/*
- * SNDRV_FIREWIRE_IOCTL_LOCK prevents the driver from streaming.
- * Returns -EBUSY if the driver is already streaming.
- */
-
-#endif /* _UAPI_SOUND_FIREWIRE_H_INCLUDED */