diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 19:01:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-25 19:01:15 -0700 |
| commit | 2ce6c0f56af9a2db006129f2fd83d727543ade2a (patch) | |
| tree | 904b452e9eb13da7b07d86b6c72a7c01463424b2 /include/linux | |
| parent | af9037dd1d87e057f5d4a638231b12ebf90e107c (diff) | |
| parent | 804ca075d25251a5e8a4f416199f2da0f218e62d (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dvb/frontend.h | 6 | ||||
| -rw-r--r-- | include/linux/dvb/net.h | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index 9ffb970cf7d8..51a69e389eae 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -59,9 +59,9 @@ typedef enum fe_caps { FE_CAN_BANDWIDTH_AUTO = 0x40000, FE_CAN_GUARD_INTERVAL_AUTO = 0x80000, FE_CAN_HIERARCHY_AUTO = 0x100000, - FE_CAN_RECOVER = 0x20000000, - FE_CAN_CLEAN_SETUP = 0x40000000, - FE_CAN_MUTE_TS = 0x80000000 + FE_NEEDS_BENDING = 0x20000000, // frontend requires frequency bending + FE_CAN_RECOVER = 0x40000000, // frontend can recover from a cable unplug automatically + FE_CAN_MUTE_TS = 0x80000000 // frontend can stop spurious TS data output } fe_caps_t; diff --git a/include/linux/dvb/net.h b/include/linux/dvb/net.h index 4b8fa5177d43..c14101491ac9 100644 --- a/include/linux/dvb/net.h +++ b/include/linux/dvb/net.h @@ -30,6 +30,9 @@ struct dvb_net_if { __u16 pid; __u16 if_num; + __u8 feedtype; +#define DVB_NET_FEEDTYPE_MPE 0 /* multi protocol encapsulation */ +#define DVB_NET_FEEDTYPE_ULE 1 /* ultra lightweight encapsulation */ }; @@ -37,5 +40,14 @@ struct dvb_net_if { #define NET_REMOVE_IF _IO('o', 53) #define NET_GET_IF _IOWR('o', 54, struct dvb_net_if) -#endif /*_DVBNET_H_*/ +/* binary compatibility cruft: */ +struct __dvb_net_if_old { + __u16 pid; + __u16 if_num; +}; +#define __NET_ADD_IF_OLD _IOWR('o', 52, struct __dvb_net_if_old) +#define __NET_GET_IF_OLD _IOWR('o', 54, struct __dvb_net_if_old) + + +#endif /*_DVBNET_H_*/ |