diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-04-16 15:20:06 +0200 |
| commit | cf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch) | |
| tree | 375bbc1ade1a92acd6493d224dd701fd7f209014 /sound/sparc | |
| parent | 1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff) | |
| parent | 0340c7dccd80d8706c636e030a6ebbddbddca690 (diff) | |
| download | kernel_goldelico_gta04-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.zip kernel_goldelico_gta04-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.gz kernel_goldelico_gta04-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.bz2 | |
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'sound/sparc')
| -rw-r--r-- | sound/sparc/cs4231.c | 1 | ||||
| -rw-r--r-- | sound/sparc/dbri.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 8d13d93..7dcc065 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -10,7 +10,6 @@ #include <linux/module.h> #include <linux/kernel.h> -#include <linux/slab.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/interrupt.h> diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 1d2e51b..2eab6ce 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -58,6 +58,7 @@ #include <linux/irq.h> #include <linux/io.h> #include <linux/dma-mapping.h> +#include <linux/gfp.h> #include <sound/core.h> #include <sound/pcm.h> |