diff options
author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /drivers/media/video/tlg2300/pd-dvb.c | |
parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/media/video/tlg2300/pd-dvb.c')
-rw-r--r-- | drivers/media/video/tlg2300/pd-dvb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/tlg2300/pd-dvb.c b/drivers/media/video/tlg2300/pd-dvb.c index 4133aee568bf..ebd9cb5bec74 100644 --- a/drivers/media/video/tlg2300/pd-dvb.c +++ b/drivers/media/video/tlg2300/pd-dvb.c | |||
@@ -3,6 +3,7 @@ | |||
3 | #include <linux/usb.h> | 3 | #include <linux/usb.h> |
4 | #include <linux/dvb/dmx.h> | 4 | #include <linux/dvb/dmx.h> |
5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
6 | #include <linux/gfp.h> | ||
6 | 7 | ||
7 | #include "vendorcmds.h" | 8 | #include "vendorcmds.h" |
8 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |