diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-04 13:46:43 -0500 |
| commit | c64eae9a73a847c1698f913c893aa4012d2a30b0 (patch) | |
| tree | 732684b9ffe9dfd6e9a11b1f006eaaefeb0e945b /sound/atmel/ac97c.c | |
| parent | c9e358dfc4a8cb2227172ef77908c2e0ee17bcb9 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into devicetree/next
Diffstat (limited to 'sound/atmel/ac97c.c')
| -rw-r--r-- | sound/atmel/ac97c.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c index 10c3a871a12..b310702c646 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c | |||
| @@ -33,9 +33,12 @@ | |||
| 33 | #include <linux/dw_dmac.h> | 33 | #include <linux/dw_dmac.h> |
| 34 | 34 | ||
| 35 | #include <mach/cpu.h> | 35 | #include <mach/cpu.h> |
| 36 | #include <mach/hardware.h> | ||
| 37 | #include <mach/gpio.h> | 36 | #include <mach/gpio.h> |
| 38 | 37 | ||
| 38 | #ifdef CONFIG_ARCH_AT91 | ||
| 39 | #include <mach/hardware.h> | ||
| 40 | #endif | ||
| 41 | |||
| 39 | #include "ac97c.h" | 42 | #include "ac97c.h" |
| 40 | 43 | ||
| 41 | enum { | 44 | enum { |