git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
sound
/
atmel
/
ac97c.c
diff --git
a/sound/atmel/ac97c.c
b/sound/atmel/ac97c.c
index
10c3a87
..
b310702
100644
(file)
--- 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 {