diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 12:24:22 -0400 |
| commit | 83928e17b92b7a667bfe674f1b330619adc2ac88 (patch) | |
| tree | bdfc0fd037ad1380d75cefa0e47be24e344d977c /sound | |
| parent | 9be16a03928642f944915b8c05945fd87b7a15cb (diff) | |
| parent | 50f4c001bc1534db77663592496204ceba151e97 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Minor manual fixups for gfp_t clashes.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/aaci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index b2d5db20ec8c..559ead6367da 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 22 | #include <asm/irq.h> | 22 | #include <asm/irq.h> |
| 23 | #include <asm/sizes.h> | ||
| 23 | #include <asm/hardware/amba.h> | 24 | #include <asm/hardware/amba.h> |
| 24 | 25 | ||
| 25 | #include <sound/driver.h> | 26 | #include <sound/driver.h> |