diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 09:44:30 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 09:44:30 (GMT) |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/media/video/tlg2300/pd-alsa.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
| download | linux-4a1032faac94ebbf647460ae3e06fc21146eb280.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 6f42621..9f8b7da 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> |