diff --git a/[refs] b/[refs]
index d8f4bacbac06..15fc4e37dca5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d698f1c72629ff43d0cb6b9f1d17c491c057a0d9
+refs/heads/master: 1d3d1d3e0356b583b642b016f874e2d1bd578453
diff --git a/trunk/sound/oss/Kconfig b/trunk/sound/oss/Kconfig
index 6275266dde2e..558c6ed443be 100644
--- a/trunk/sound/oss/Kconfig
+++ b/trunk/sound/oss/Kconfig
@@ -478,6 +478,20 @@ config SOUND_ACI_MIXER
 
 	  This driver is also available as a module and will be called aci.
 
+config SOUND_CS4232
+	tristate "Crystal CS4232 based (PnP) cards"
+	depends on SOUND_OSS
+	help
+	  Say Y here if you have a card based on the Crystal CS4232 chip set,
+	  which uses its own Plug and Play protocol.
+
+	  If you compile the driver into the kernel, you have to add
+	  "cs4232=<io>,<irq>,<dma>,<dma2>,<mpuio>,<mpuirq>" to the kernel
+	  command line.
+
+	  See <file:Documentation/sound/oss/CS4232> for more information on
+	  configuring this card.
+
 config SOUND_VMIDI
 	tristate "Loopback MIDI device support"
 	depends on SOUND_OSS