diff --git a/[refs] b/[refs]
index cf10f555b2f9..02c57e345ced 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd474f2d548af3c0eb932d9d47ec11483861aa6f
+refs/heads/master: ef9dfa4b1052af23a603de382d4665b2d1fccc61
diff --git a/trunk/include/sound/driver.h b/trunk/include/sound/driver.h
deleted file mode 100644
index f0359437d01a..000000000000
--- a/trunk/include/sound/driver.h
+++ /dev/null
@@ -1 +0,0 @@
-#warning "This file is deprecated"