diff --git a/[refs] b/[refs]
index d955239630f9..cddd1c20f639 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e636f78e5bbe95831e4d0071ee8f40b507e1cbd
+refs/heads/master: d15cad5df1dac17ae33152646f599f0bdc6be48e
diff --git a/trunk/drivers/cdrom/gdrom.c b/trunk/drivers/cdrom/gdrom.c
index 1e0455bd6df9..1231d95aa695 100644
--- a/trunk/drivers/cdrom/gdrom.c
+++ b/trunk/drivers/cdrom/gdrom.c
@@ -471,6 +471,12 @@ static int gdrom_getsense(short *bufstring)
 	return err;
 }
 
+static int gdrom_audio_ioctl(struct cdrom_device_info *cdi, unsigned int cmd,
+			     void *arg)
+{
+	return -EINVAL;
+}
+
 static struct cdrom_device_ops gdrom_ops = {
 	.open			= gdrom_open,
 	.release		= gdrom_release,
@@ -478,6 +484,7 @@ static struct cdrom_device_ops gdrom_ops = {
 	.media_changed		= gdrom_mediachanged,
 	.get_last_session	= gdrom_get_last_session,
 	.reset			= gdrom_hardreset,
+	.audio_ioctl		= gdrom_audio_ioctl,
 	.capability		= CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
 				  CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
 	.n_minors		= 1,