diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-08 14:15:26 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-08 14:15:29 -0500 |
| commit | 8e9255e6a2141e050d51bc4d96dbef494a87d653 (patch) | |
| tree | f190b142830153eaab05555a93c4f71a144ba3d4 /sound/soc/fsl/mpc5200_dma.c | |
| parent | 5091faa449ee0b7d73bc296a93bca9540fc51d0a (diff) | |
| parent | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: we want to queue up dependent cleanup
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/fsl/mpc5200_dma.c')
| -rw-r--r-- | sound/soc/fsl/mpc5200_dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index dce6b551cd78..f92dca07cd35 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/of_device.h> | 10 | #include <linux/of_device.h> |
| 11 | #include <linux/slab.h> | 11 | #include <linux/slab.h> |
| 12 | #include <linux/of_device.h> | ||
| 13 | #include <linux/of_platform.h> | 12 | #include <linux/of_platform.h> |
| 14 | 13 | ||
| 15 | #include <sound/soc.h> | 14 | #include <sound/soc.h> |