From c106fe7751426c8c30706d2f131491dc8f37ee85 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 2 Mar 2010 19:57:17 +0000
Subject: Drop support for old-style DVB code.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30818 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/dvbin.h | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)

(limited to 'stream/dvbin.h')

diff --git a/stream/dvbin.h b/stream/dvbin.h
index 18a37d9522..e278e79489 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -15,27 +15,9 @@
 #define LOF1 (9750*1000UL)
 #define LOF2 (10600*1000UL)
 
-#ifdef CONFIG_DVB_HEAD
-	#include <linux/dvb/dmx.h>
-	#include <linux/dvb/frontend.h>
-	#include <linux/dvb/version.h>
-#else
-	#include <ost/dmx.h>
-	#include <ost/sec.h>
-	#include <ost/frontend.h>
-	#define fe_status_t FrontendStatus
-	#define fe_spectral_inversion_t SpectralInversion
-	#define fe_modulation_t Modulation
-	#define fe_code_rate_t CodeRate
-	#define fe_transmit_mode_t TransmitMode
-	#define fe_guard_interval_t GuardInterval
-	#define fe_bandwidth_t BandWidth
-	#define fe_hierarchy_t Hierarchy
-	#define fe_sec_voltage_t SecVoltage
-	#define dmx_pes_filter_params dmxPesFilterParams
-	#define dmx_sct_filter_params dmxSctFilterParams
-	#define dmx_pes_type_t dmxPesType_t
-#endif
+#include <linux/dvb/dmx.h>
+#include <linux/dvb/frontend.h>
+#include <linux/dvb/version.h>
 
 #undef DVB_ATSC
 #if defined(DVB_API_VERSION_MINOR)
-- 
cgit v1.2.3