On Mon, Oct 18, 2010 at 05:30:39PM -0700, Peter Hsiang wrote: > On Mon, Oct 18, 2010, Mark Brown wrote: > > Your patch was apparently not generated against the mainline Makefile or > > Kconfig and the automated conflict resolution tool I used (which is > > normally fairly reliable) appears to have misplaced the header. I've > > restored the driver with the readdition of the header. > .../pub/scm/linux/kernel/git/next/linux-next.git Right? As previously advised several times you should be submitting against the latest for-whatever branch of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for ASoC. That will *generally* be what's in -next but not always. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html