diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-03 08:15:35 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-03 08:15:35 (GMT) |
commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
tree | 99e5b423473097756353d038f922b2623f3edd2a /include/linux/dvb/net.h | |
parent | 1bded710a574f20d41bc9e7fb531301db282d623 (diff) | |
parent | fb53fde9762432d091dac209bdf4f3f850117c55 (diff) | |
download | linux-fsl-qoriq-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'include/linux/dvb/net.h')
-rw-r--r-- | include/linux/dvb/net.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/dvb/net.h b/include/linux/dvb/net.h index 5be474b..f451e7e 100644 --- a/include/linux/dvb/net.h +++ b/include/linux/dvb/net.h @@ -24,8 +24,7 @@ #ifndef _DVBNET_H_ #define _DVBNET_H_ -#include <asm/types.h> - +#include <linux/types.h> struct dvb_net_if { __u16 pid; |