diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-22 12:24:26 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-22 12:41:48 -0500 |
| commit | 695884fb8acd9857e0e7120ccb2150e30f4b8fef (patch) | |
| tree | 49aa424c1a021ce432e9fa5ea29d37a23e4e30cc /sound/soc/omap/overo.c | |
| parent | 5df91509d324d44cfb11e55d9cb02fe18b53b045 (diff) | |
| parent | 04bea68b2f0eeebb089ecc67b618795925268b4a (diff) | |
Merge branch 'devicetree/for-x86' of git://git.secretlab.ca/git/linux-2.6 into x86/platform
Reason: x86 devicetree support for ce4100 depends on those device tree
changes scheduled for .39.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'sound/soc/omap/overo.c')
| -rw-r--r-- | sound/soc/omap/overo.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index e95a607937de..bbcf380bfb56 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <sound/core.h> | 24 | #include <sound/core.h> |
| 25 | #include <sound/pcm.h> | 25 | #include <sound/pcm.h> |
| 26 | #include <sound/soc.h> | 26 | #include <sound/soc.h> |
| 27 | #include <sound/soc-dapm.h> | ||
| 28 | 27 | ||
| 29 | #include <asm/mach-types.h> | 28 | #include <asm/mach-types.h> |
| 30 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |