@@ -293,14 +293,24 @@ CONFIG_SERIAL_NONSTANDARD=y
CONFIG_SERIO_SERPORT=m
CONFIG_SGI_PARTITION=y
CONFIG_SM_FTL=m
+CONFIG_SND=m
# CONFIG_SND_BT87X_OVERCLOCK is not set
CONFIG_SND_EMU10K1_SEQ=m
CONFIG_SND_HIFIER=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_PCM_OSS is not set
# 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_SPARSE_IRQ=y
CONFIG_SPI_DESIGNWARE=y
@@ -276,12 +276,22 @@ CONFIG_SERIO_AMBAKMI=m
CONFIG_SERIO_SERPORT=m
CONFIG_SGI_PARTITION=y
CONFIG_SM_FTL=m
+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_PCM_OSS=m
# 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_SPARSE_IRQ is not set
CONFIG_SPI_DESIGNWARE=m
CONFIG_SPI_PL022=m
@@ -189,7 +189,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_SPI_SPIDEV=m
# CONFIG_SQUASHFS_LZO is not set
@@ -189,7 +189,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_SPI_SPIDEV is not set
CONFIG_SQUASHFS_LZO=y
@@ -4705,7 +4705,6 @@ CONFIG_SMSC_SCH311X_WDT=m
CONFIG_SMS_SDIO_DRV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_USB_DRV=m
-CONFIG_SND=m
CONFIG_SND_AC97_CODEC=m
CONFIG_SND_AC97_POWER_SAVE=y
CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
@@ -4840,11 +4839,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_RX51=m
@@ -4860,7 +4856,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_PLUGINS=y
CONFIG_SND_PCSP=m
@@ -4892,7 +4887,6 @@ CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_SERIAL_U16550=m
CONFIG_SND_SIS7019=m
-CONFIG_SND_SOC=m
CONFIG_SND_SOC_88PM860X=m
CONFIG_SND_SOC_AD1836=m
CONFIG_SND_SOC_AD193X=m
@@ -4914,7 +4908,6 @@ CONFIG_SND_SOC_CS42L51=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
@@ -4934,7 +4927,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
@@ -4987,7 +4979,6 @@ CONFIG_SND_SPI=y
CONFIG_SND_SSCAPE=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
@@ -5033,7 +5024,6 @@ CONFIG_SOFT_WATCHDOG=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
@@ -290,14 +290,24 @@ CONFIG_SERIAL_NONSTANDARD=y
CONFIG_SERIO_SERPORT=m
CONFIG_SGI_PARTITION=y
CONFIG_SM_FTL=m
+CONFIG_SND=m
# CONFIG_SND_BT87X_OVERCLOCK is not set
CONFIG_SND_EMU10K1_SEQ=m
CONFIG_SND_HIFIER=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_PCM_OSS is not set
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_SPARSE_IRQ=y
CONFIG_SPI_DESIGNWARE=y
@@ -280,14 +280,24 @@ CONFIG_SERIAL_PMACZILOG=y
CONFIG_SERIO_SERPORT=m
CONFIG_SGI_PARTITION=y
# CONFIG_SM_FTL is not set
+CONFIG_SND=m
CONFIG_SND_BT87X_OVERCLOCK=y
CONFIG_SND_EMU10K1_SEQ=m
# CONFIG_SND_HIFIER is not set
+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_PCM_OSS is not set
# 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_SPARSE_IRQ=y
CONFIG_SPI_DESIGNWARE=y
@@ -313,14 +313,24 @@ CONFIG_SERIAL_PMACZILOG=y
CONFIG_SERIO_SERPORT=m
CONFIG_SGI_PARTITION=y
# CONFIG_SM_FTL is not set
+CONFIG_SND=m
CONFIG_SND_BT87X_OVERCLOCK=y
CONFIG_SND_EMU10K1_SEQ=m
# CONFIG_SND_HIFIER is not set
+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_PCM_OSS is not set
# 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_SPARSE_IRQ=y
CONFIG_SPI_DESIGNWARE=y
Snd_omap_soc_beagle depends on snd_omap_soc and snd_omap_soc_mcbsp but it doesn't have any explicit dependecy on them (e.g. a symbol that forces loading these modules). To aggravate the situation, SOC sound core debugging/registration/dependency checking is all done via dev_dbg() macros that are NULLs if people don't recompile their kernels with debug (#define DEBUG in sound/soc/soc-core.c), leading to a completely silent kernel when the snd_omap_soc_beagle module was loaded (and making people to think that snd support was broken), while it was "simply" missing codecs and DAIs. Since i can't introduce any dummy symbols to force proper dependencies among modules (and thus triggering auto loading when necessary), resolve this dependecy issue once and for all compiling in all the mandatory modules. BugLink: http://bugs.launchpad.net/bugs/1019321 Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 10 ++++++++++ debian.master/config/armel/config.common.armel | 10 ++++++++++ debian.master/config/armhf/config.flavour.highbank | 10 ++++++++++ debian.master/config/armhf/config.flavour.omap | 10 ++++++++++ debian.master/config/config.common.ubuntu | 10 ---------- debian.master/config/i386/config.common.i386 | 10 ++++++++++ debian.master/config/powerpc/config.common.powerpc | 10 ++++++++++ debian.master/config/ppc64/config.common.ppc64 | 10 ++++++++++ 8 files changed, 70 insertions(+), 10 deletions(-)