Merge branch 'topic/asoc' into for-linus

Browse source

* topic/asoc:
  ASoC: Disable S3C64xx support in Kconfig
  ASoC: magician: remove un-necessary #include of pxa-regs.h and hardware.h

...

This commit is contained in:

Takashi Iwai 2009-04-15 11:24:14 +02:00

parent 2e8e59f437 34e51ce60a

commit 035f5afb02

2 changed files with 3 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

sound/soc/pxa/magician.c

View file

6

sound/soc/s3c24xx/Kconfig

View file