summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 09:24:22 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 09:24:22 -0700
commit83928e17b92b7a667bfe674f1b330619adc2ac88 (patch)
treebdfc0fd037ad1380d75cefa0e47be24e344d977c /sound
parent9be16a03928642f944915b8c05945fd87b7a15cb (diff)
parent50f4c001bc1534db77663592496204ceba151e97 (diff)
downloadblackbird-op-linux-83928e17b92b7a667bfe674f1b330619adc2ac88.tar.gz
blackbird-op-linux-83928e17b92b7a667bfe674f1b330619adc2ac88.zip
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.c1
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 @@
#include <asm/io.h>
#include <asm/irq.h>
+#include <asm/sizes.h>
#include <asm/hardware/amba.h>
#include <sound/driver.h>
OpenPOWER on IntegriCloud