diff --git a/[refs] b/[refs]
index f24ca978c2e9..d8a7cb33e8d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b3f558727244efb6edb0866952331f537da13a4
+refs/heads/master: fa8174db0fd032c3d48cc0873946358c68e44d4f
diff --git a/trunk/sound/arm/Kconfig b/trunk/sound/arm/Kconfig
index 0864a7ce414d..2e4a5e0d16db 100644
--- a/trunk/sound/arm/Kconfig
+++ b/trunk/sound/arm/Kconfig
@@ -7,7 +7,6 @@ config SND_SA11XX_UDA1341
 	tristate "SA11xx UDA1341TS driver (iPaq H3600)"
 	depends on ARCH_SA1100 && SND && L3
 	select SND_PCM
-	select SND_GENERIC_DRIVER
 	help
 	  Say Y here if you have a Compaq iPaq H3x00 handheld computer
 	  and want to use its Philips UDA 1341 audio chip.