diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5ceae25..def1fa3 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -234,12 +234,22 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SND=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
+CONFIG_SND_PCM=m
 # CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_TIMER=m
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SQUASHFS_LZO=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index d244444..cbee720 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -246,11 +246,21 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SND=y
 # CONFIG_SND_EMU10K1_SEQ is not set
+CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
+CONFIG_SND_PCM=y
 # CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_TIMER=y
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SOUND=y
 CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SQUASHFS_LZO=y
diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank
index 301dfe5..2ef43c1 100644
--- a/debian.master/config/armhf/config.flavour.highbank
+++ b/debian.master/config/armhf/config.flavour.highbank
@@ -171,7 +171,17 @@ CONFIG_SERIAL_AMBA_PL011=y
 # CONFIG_SERIO_AMBAKMI is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_PARTITION is not set
+CONFIG_SND=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
+CONFIG_SND_PCM=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_TIMER=m
 # CONFIG_SOLARIS_X86_PARTITION is not set
+CONFIG_SOUND=m
 CONFIG_SPI_PL022=y
 # CONFIG_SQUASHFS_LZO is not set
 # CONFIG_SQUASHFS_XATTR is not set
diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap
index 44344da..4bb355d 100644
--- a/debian.master/config/armhf/config.flavour.omap
+++ b/debian.master/config/armhf/config.flavour.omap
@@ -171,7 +171,17 @@ CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SND=y
+CONFIG_SND_OMAP_SOC=y
+CONFIG_SND_OMAP_SOC_MCBSP=y
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=y
+CONFIG_SND_PCM=y
+CONFIG_SND_SOC=y
+CONFIG_SND_SOC_I2C_AND_SPI=y
+CONFIG_SND_SOC_TWL4030=y
+CONFIG_SND_TIMER=y
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SOUND=y
 CONFIG_SPI_PL022=m
 CONFIG_SQUASHFS_LZO=y
 CONFIG_SQUASHFS_XATTR=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index a1bcec2..df963eb 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -4990,7 +4990,6 @@ CONFIG_SMS_SDIO_DRV=m
 CONFIG_SMS_SIANO_MDTV=m
 CONFIG_SMS_USB_DRV=m
 CONFIG_SM_FTL=m
-CONFIG_SND=m
 CONFIG_SND_AC97_CODEC=m
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
@@ -5125,11 +5124,8 @@ CONFIG_SND_MSND_PINNACLE=m
 CONFIG_SND_MTPAV=m
 CONFIG_SND_MTS64=m
 CONFIG_SND_NM256=m
-CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_OMAP_SOC_IGEP0020=m
-CONFIG_SND_OMAP_SOC_MCBSP=m
 CONFIG_SND_OMAP_SOC_OMAP3EVM=m
-CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_OMAP_SOC_OVERO=m
 CONFIG_SND_OMAP_SOC_SDP3430=m
@@ -5144,7 +5140,6 @@ CONFIG_SND_OSSEMUL=y
 CONFIG_SND_OXYGEN=m
 CONFIG_SND_OXYGEN_LIB=m
 CONFIG_SND_PCI=y
-CONFIG_SND_PCM=m
 CONFIG_SND_PCMCIA=y
 # CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_PCSP=m
@@ -5177,7 +5172,6 @@ CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 CONFIG_SND_SERIAL_U16550=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIS7019=m
-CONFIG_SND_SOC=m
 CONFIG_SND_SOC_88PM860X=m
 CONFIG_SND_SOC_AD1836=m
 CONFIG_SND_SOC_AD193X=m
@@ -5201,7 +5195,6 @@ CONFIG_SND_SOC_CS42L73=m
 CONFIG_SND_SOC_CX20442=m
 CONFIG_SND_SOC_DA7210=m
 CONFIG_SND_SOC_DFBMCS320=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_JZ4740_CODEC=m
 CONFIG_SND_SOC_L3=m
 CONFIG_SND_SOC_LM4857=m
@@ -5226,7 +5219,6 @@ CONFIG_SND_SOC_TLV320AIC32X4=m
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320DAC33=m
 CONFIG_SND_SOC_TPA6130A2=m
-CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_SOC_UDA134X=m
 CONFIG_SND_SOC_UDA1380=m
@@ -5281,7 +5273,6 @@ CONFIG_SND_SSCAPE=m
 CONFIG_SND_SST_PLATFORM=m
 CONFIG_SND_SUPPORT_OLD_API=y
 CONFIG_SND_TEA575X=m
-CONFIG_SND_TIMER=m
 CONFIG_SND_TRIDENT=m
 CONFIG_SND_USB=y
 CONFIG_SND_USB_6FIRE=m
@@ -5328,7 +5319,6 @@ CONFIG_SOLO6X10=m
 CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
-CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
 # CONFIG_SOUND_PRIME is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 8d04b53..a995d51 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -233,12 +233,22 @@ CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SND=m
 # CONFIG_SND_BT87X_OVERCLOCK is not set
 CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 CONFIG_SND_OPL4_LIB_SEQ=m
+CONFIG_SND_PCM=m
 CONFIG_SND_SBAWE_SEQ=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_TIMER=m
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SOUND=m
 # CONFIG_SPARSEMEM_MANUAL is not set
 CONFIG_SPI_PXA2XX_PCI=y
 CONFIG_SQUASHFS_LZO=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 93d3fa8..5c0ca20 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -224,12 +224,22 @@ CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SND=m
 CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
+CONFIG_SND_PCM=m
 # CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_TIMER=m
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SQUASHFS_LZO=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index fd0fb43..c2d38c6 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -259,12 +259,22 @@ CONFIG_SERIAL_8250_PCI=m
 CONFIG_SERIAL_NONSTANDARD=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SGI_PARTITION=y
+CONFIG_SND=m
 CONFIG_SND_BT87X_OVERCLOCK=y
 CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_OMAP_SOC=m
+CONFIG_SND_OMAP_SOC_MCBSP=m
+CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 # CONFIG_SND_OPL4_LIB_SEQ is not set
+CONFIG_SND_PCM=m
 # CONFIG_SND_SBAWE_SEQ is not set
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+CONFIG_SND_SOC_TWL4030=m
+CONFIG_SND_TIMER=m
 CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_SOUND=m
 CONFIG_SPARSEMEM_MANUAL=y
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SQUASHFS_LZO=y
