The patch titled soc: fix I2C build errors has been added to the -mm tree. Its filename is soc-fix-i2c-build-errors.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: soc: fix I2C build errors From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Fix soc build errors when I2C is built as a loadable module: (.text+0x5d26b): undefined reference to `i2c_master_send' soc-cache.c:(.text+0x5d32d): undefined reference to `i2c_transfer' Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Cc: Timur Tabi <timur@xxxxxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- sound/soc/soc-cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN sound/soc/soc-cache.c~soc-fix-i2c-build-errors sound/soc/soc-cache.c --- a/sound/soc/soc-cache.c~soc-fix-i2c-build-errors +++ a/sound/soc/soc-cache.c @@ -108,7 +108,7 @@ static unsigned int snd_soc_8_16_read(st return cache[reg]; } -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) static unsigned int snd_soc_8_16_read_i2c(struct snd_soc_codec *codec, unsigned int r) { @@ -200,7 +200,7 @@ int snd_soc_codec_set_cache_io(struct sn break; case SND_SOC_I2C: -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) codec->hw_write = (hw_write_t)i2c_master_send; #endif if (io_types[i].i2c_read) _ Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are origin.patch linux-next.patch soc-fix-i2c-build-errors.patch media-zr364xx-fix-build-errors.patch input-drivers-input-xpadc-improve-xbox-360-wireless-support-and-add-sysfs-interface.patch kernel-hacking-move-strip_asm_syms-from-general.patch mtd-make-onenand-genericc-more-generic-fix.patch isdn-fix-netjet-build-errors.patch mm-make-swap-token-dummies-static-inlines-fix-2.patch readahead-add-blk_run_backing_dev-fix-fix-2.patch page_alloc-fix-kernel-doc-warning.patch ksm-add-some-documentation.patch add-a-driver-for-the-winbond-wpcd376i-ir-functionality-select-bitreverse.patch lis3-add-power-management-functions-fix.patch procfs-provide-stack-information-for-threads-v011-fix.patch spih-add-missing-kernel-doc-for-struct-spi_master.patch gpiolib-allow-exported-gpio-nodes-to-be-named-using-sysfs-links-update-fix.patch doc-filesystems-remove-smount-program.patch doc-filesystems-more-mount-cleanups.patch documentation-update-stale-definition-of-file-nr-in-fstxt.patch reiser4-export-remove_from_page_cache-fix.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html