diff --git a/[refs] b/[refs]
index cbcc4c5e9279..3b0480efe9ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1912a85b54c27738afe1c4fa069df02d3316f0c
+refs/heads/master: 18039ae9de672f46a1a4fa404f8e6ae009bed734
diff --git a/trunk/drivers/staging/go7007/Makefile b/trunk/drivers/staging/go7007/Makefile
index d14ea84a01f6..1301caa7495d 100644
--- a/trunk/drivers/staging/go7007/Makefile
+++ b/trunk/drivers/staging/go7007/Makefile
@@ -32,8 +32,3 @@ endif
 
 EXTRA_CFLAGS += -Idrivers/media/dvb/frontends
 EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core
-
-# Ubuntu 8.04 has CONFIG_SND undefined, so include lum sound/config.h too
-ifeq ($(CONFIG_SND),)
-EXTRA_CFLAGS += -include sound/config.h
-endif