On Wed, Mar 11, 2009 at 10:40:49AM +0000, Russell King wrote:
> But, at the end of the day, these things have to be fixed one way or
> other, whether that be by removing the offending commits, by reverting
> the patches, or patching the specific bad changes back to how they
> originally were. I really don't mind which option is taken, just so
> long as the final outcome is the right one.
Let's go with reverting things, then - that avoids having to drop the
audio drivers and the subsequent work that was done on them.
Takashi, here's an initial revert of the two hunks I mentioned
previously - I've not checked the other two hunks yet.
The following changes since commit f455dfb106916d855d59686fe16575c2ceb2cb2a:
Mark Brown (1):
ASoC: Fix up merge with the ARM tree
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30
Mark Brown (2):
[ARM] Revert extraneous changes from the S3C audio header move
Merge branch 's3c-iis-header' into for-2.6.30
arch/arm/mach-s3c2410/include/mach/hardware.h | 3 +++
arch/arm/mach-shark/include/mach/io.h | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
--
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
