summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-07 02:45:39 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-12-07 02:45:39 -0800
commitdcd9a62643335bdf300ebd6ade333f3c8b882e77 (patch)
tree734a47d55e3842c9f6443ac029f09f3184456c49 /include/linux
parent21d3de02e3111b15b3f20e4ac9cd6af33cf68938 (diff)
parent5c6b524308b64fdb2b16c02778a9e0f16b24190a (diff)
Merge bk://gkernel.bkbits.net/libata-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/dvb/frontend.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index d0300dcff0af..585560022ba0 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -78,7 +78,7 @@ struct dvb_frontend_info {
__u32 symbol_rate_min;
__u32 symbol_rate_max;
__u32 symbol_rate_tolerance; /* ppm */
- __u32 notifier_delay; /* ms */
+ __u32 notifier_delay; /* DEPRECATED */
fe_caps_t caps;
};