diff --git a/[refs] b/[refs]
index 3b05cd5cae92..7aa509906d41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b261016f04eb5df1e1e652794f1f4d7dd072566
+refs/heads/master: de5bec6bb57e88db7efa49c6f7de0794ae67d06a
diff --git a/trunk/drivers/media/video/bt8xx/bttv-driver.c b/trunk/drivers/media/video/bt8xx/bttv-driver.c
index 2cdbac302092..28b3a3efb84f 100644
--- a/trunk/drivers/media/video/bt8xx/bttv-driver.c
+++ b/trunk/drivers/media/video/bt8xx/bttv-driver.c
@@ -1454,15 +1454,6 @@ static int get_control(struct bttv *btv, struct v4l2_control *c)
 		case V4L2_CID_AUDIO_VOLUME:
 			c->value = va.volume;
 			break;
-		case V4L2_CID_AUDIO_BALANCE:
-			c->value = va.balance;
-			break;
-		case V4L2_CID_AUDIO_BASS:
-			c->value = va.bass;
-			break;
-		case V4L2_CID_AUDIO_TREBLE:
-			c->value = va.treble;
-			break;
 		}
 		return 0;
 	}
@@ -1557,15 +1548,6 @@ static int set_control(struct bttv *btv, struct v4l2_control *c)
 		case V4L2_CID_AUDIO_VOLUME:
 			va.volume = c->value;
 			break;
-		case V4L2_CID_AUDIO_BALANCE:
-			va.balance = c->value;
-			break;
-		case V4L2_CID_AUDIO_BASS:
-			va.bass = c->value;
-			break;
-		case V4L2_CID_AUDIO_TREBLE:
-			va.treble = c->value;
-			break;
 		}
 		btv->audio_hook(btv,&va,1);
 		return 0;
@@ -2899,18 +2881,6 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
 				if (!(va.flags & VIDEO_AUDIO_VOLUME))
 					*c = no_ctl;
 				break;
-			case V4L2_CID_AUDIO_BALANCE:
-				if (!(va.flags & VIDEO_AUDIO_BALANCE))
-					*c = no_ctl;
-				break;
-			case V4L2_CID_AUDIO_BASS:
-				if (!(va.flags & VIDEO_AUDIO_BASS))
-					*c = no_ctl;
-				break;
-			case V4L2_CID_AUDIO_TREBLE:
-				if (!(va.flags & VIDEO_AUDIO_TREBLE))
-					*c = no_ctl;
-				break;
 			}
 		}
 #endif