diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-20 23:06:15 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-20 23:06:15 +0100 |
| commit | d1a7fddf420b1f5a7d9a899b3388026084a67d33 (patch) | |
| tree | 7044a8b9a1b6fadc7b027d4a82840c084b0c8012 /include/linux/dvb | |
| parent | 778c4c821779bb7eef7f5a1eea4d15d05d976f8b (diff) | |
| parent | c0e1936338a11ea252d11370ff62e40db334f646 (diff) | |
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
Diffstat (limited to 'include/linux/dvb')
| -rw-r--r-- | include/linux/dvb/frontend.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h index 6e4ace270276..79a8ed8e6a7d 100644 --- a/include/linux/dvb/frontend.h +++ b/include/linux/dvb/frontend.h @@ -166,6 +166,7 @@ typedef enum fe_modulation { VSB_16, PSK_8, APSK_16, + APSK_32, DQPSK, } fe_modulation_t; @@ -295,6 +296,7 @@ typedef enum fe_delivery_system { SYS_DVBC_ANNEX_AC, SYS_DVBC_ANNEX_B, SYS_DVBT, + SYS_DSS, SYS_DVBS, SYS_DVBS2, SYS_DVBH, |