diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 04:08:44 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-23 04:08:44 +0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/media/video/tlg2300/pd-alsa.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
| download | linux-6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1.tar.xz | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/media/video/tlg2300/pd-alsa.c')
| -rw-r--r-- | drivers/media/video/tlg2300/pd-alsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tlg2300/pd-alsa.c b/drivers/media/video/tlg2300/pd-alsa.c index 6f42621ad478..9f8b7da56b67 100644 --- a/drivers/media/video/tlg2300/pd-alsa.c +++ b/drivers/media/video/tlg2300/pd-alsa.c @@ -4,10 +4,10 @@ #include <linux/sound.h> #include <linux/spinlock.h> #include <linux/soundcard.h> -#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/proc_fs.h> #include <linux/module.h> +#include <linux/gfp.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> |