diff options
author | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
---|---|---|
committer | Jiri Kosina | 2011-02-15 10:24:31 +0100 |
commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /sound/atmel/ac97c.c | |
parent | MAINTAINERS: fix sorting (diff) | |
parent | klist: Fix object alignment on 64-bit. (diff) | |
download | kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.gz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.tar.xz kernel-qcow2-linux-0a9d59a2461477bd9ed143c01af9df3f8f00fa81.zip |
Merge branch 'master' into for-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 10c3a871a12d..b310702c646e 100644 --- a/sound/atmel/ac97c.c +++ b/sound/atmel/ac97c.c @@ -33,9 +33,12 @@ #include <linux/dw_dmac.h> #include <mach/cpu.h> -#include <mach/hardware.h> #include <mach/gpio.h> +#ifdef CONFIG_ARCH_AT91 +#include <mach/hardware.h> +#endif + #include "ac97c.h" enum { |