diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 22:21:04 +0100 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 22:21:04 +0100 |
| commit | f652f6c5b7cfdf139f4155d78f397e99ae1c4acc (patch) | |
| tree | 71c6344688bf56ea6aaf18c586ab69ff4f077ade /sound/soc/pxa/raumfeld.c | |
| parent | [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event (diff) | |
| parent | [SCSI] target: Add LIO target core v4.0.0-rc6 (diff) | |
| download | linux-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.tar.xz linux-f652f6c5b7cfdf139f4155d78f397e99ae1c4acc.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus
Diffstat (limited to 'sound/soc/pxa/raumfeld.c')
| -rw-r--r-- | sound/soc/pxa/raumfeld.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c index 2cda82bc5d2e..0fd60f423036 100644 --- a/sound/soc/pxa/raumfeld.c +++ b/sound/soc/pxa/raumfeld.c @@ -22,7 +22,6 @@ #include <linux/gpio.h> #include <sound/pcm.h> #include <sound/soc.h> -#include <sound/soc-dapm.h> #include <asm/mach-types.h> |