diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-08-28 12:05:55 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-08-28 12:05:55 -0400 |
| commit | 508dc4f8eece1a70c493afc6511fdf5934fef567 (patch) | |
| tree | b852a6a5bf9977a33a87158985de02d188ba71d7 /sound/soc/samsung/pcm.c | |
| parent | 734e9a26d612f64e1c9cfd92256969b773954ae2 (diff) | |
| parent | e3e45c01ae690e65f2650e5288b9af802e95a136 (diff) | |
Merge branch 'perf/urgent' into perf/core
Pick up the latest fixes because upcoming uprobes changes will rely on it.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'sound/soc/samsung/pcm.c')
| -rw-r--r-- | sound/soc/samsung/pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index b7b2a1f91425..89b064650f14 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <sound/pcm_params.h> | 20 | #include <sound/pcm_params.h> |
| 21 | 21 | ||
| 22 | #include <plat/audio.h> | 22 | #include <plat/audio.h> |
| 23 | #include <plat/dma.h> | 23 | #include <mach/dma.h> |
| 24 | 24 | ||
| 25 | #include "dma.h" | 25 | #include "dma.h" |
| 26 | #include "pcm.h" | 26 | #include "pcm.h" |