diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /sound/arm/devdma.c | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'sound/arm/devdma.c')
| -rw-r--r-- | sound/arm/devdma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/arm/devdma.c b/sound/arm/devdma.c index ca3bf4ee05a3..9d1e6665b546 100644 --- a/sound/arm/devdma.c +++ b/sound/arm/devdma.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | #include <linux/dma-mapping.h> | 13 | #include <linux/dma-mapping.h> |
| 14 | 14 | ||
| 15 | #include <sound/driver.h> | ||
| 16 | #include <sound/core.h> | 15 | #include <sound/core.h> |
| 17 | #include <sound/pcm.h> | 16 | #include <sound/pcm.h> |
| 18 | 17 | ||