From 06777f8a9a6143452fa672f0be7ca2840e40f7e4 Mon Sep 17 00:00:00 2001 From: Piotr Chmura Date: Mon, 31 Oct 2011 12:24:50 -0300 Subject: [PATCH] --- yaml --- r: 273607 b: refs/heads/master c: f080c2ef542b0d3c78eb2f98a4450a8e22b471af h: refs/heads/master i: 273605: 095835bb0ef7afecc1f38f5fe18979f9a1d0eeac 273603: eff32e3df93238f97b000a5842ec2558764d0182 273599: 8d34f39d2a600498d770bcf42eaff74bf8ae6941 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/as102/Makefile | 5 +++-- trunk/drivers/staging/media/as102/as10x_cmd.c | 22 ------------------- .../staging/media/as102/as10x_cmd_cfg.c | 22 ------------------- .../staging/media/as102/as10x_cmd_stream.c | 22 +------------------ 5 files changed, 5 insertions(+), 68 deletions(-) diff --git a/[refs] b/[refs] index eb3400a3a0a1..7fc0d51382a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 315cadc446714c5c1a406afff6f53aa80d1e267e +refs/heads/master: f080c2ef542b0d3c78eb2f98a4450a8e22b471af diff --git a/trunk/drivers/staging/media/as102/Makefile b/trunk/drivers/staging/media/as102/Makefile index c2334c6c952e..e7dbb6f814d5 100644 --- a/trunk/drivers/staging/media/as102/Makefile +++ b/trunk/drivers/staging/media/as102/Makefile @@ -1,5 +1,6 @@ -dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o as102_fe.o as102_usb_drv.o as10x_cmd_cfg.o +dvb-as102-objs := as102_drv.o as102_fw.o as10x_cmd.o as10x_cmd_stream.o \ + as102_fe.o as102_usb_drv.o as10x_cmd_cfg.o obj-$(CONFIG_DVB_AS102) += dvb-as102.o -EXTRA_CFLAGS += -DLINUX -DCONFIG_AS102_USB -Idrivers/media/dvb/dvb-core +EXTRA_CFLAGS += -DCONFIG_AS102_USB -Idrivers/media/dvb/dvb-core diff --git a/trunk/drivers/staging/media/as102/as10x_cmd.c b/trunk/drivers/staging/media/as102/as10x_cmd.c index 222e7032ded2..77aae3964fa2 100644 --- a/trunk/drivers/staging/media/as102/as10x_cmd.c +++ b/trunk/drivers/staging/media/as102/as10x_cmd.c @@ -18,30 +18,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ #include #include "as102_drv.h" -#elif defined(WIN32) - #if defined(__BUILDMACHINE__) && (__BUILDMACHINE__ == WinDDK) - /* win32 ddk implementation */ - #include "wdm.h" - #include "Device.h" - #include "endian_mgmt.h" /* FIXME */ - #else /* win32 sdk implementation */ - #include - #include "types.h" - #include "util.h" - #include "as10x_handle.h" - #include "endian_mgmt.h" - #endif -#else /* all other cases */ - #include - #include "types.h" - #include "util.h" - #include "as10x_handle.h" - #include "endian_mgmt.h" /* FIXME */ -#endif /* __KERNEL__ */ - #include "as10x_types.h" #include "as10x_cmd.h" diff --git a/trunk/drivers/staging/media/as102/as10x_cmd_cfg.c b/trunk/drivers/staging/media/as102/as10x_cmd_cfg.c index 0635797232e5..dca2cbf3bbdb 100644 --- a/trunk/drivers/staging/media/as102/as10x_cmd_cfg.c +++ b/trunk/drivers/staging/media/as102/as10x_cmd_cfg.c @@ -17,30 +17,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ #include #include "as102_drv.h" -#elif defined(WIN32) - #if defined(__BUILDMACHINE__) && (__BUILDMACHINE__ == WinDDK) - /* win32 ddk implementation */ - #include "wdm.h" - #include "Device.h" - #include "endian_mgmt.h" /* FIXME */ - #else /* win32 sdk implementation */ - #include - #include "types.h" - #include "util.h" - #include "as10x_handle.h" - #include "endian_mgmt.h" - #endif -#else /* all other cases */ - #include - #include "types.h" - #include "util.h" - #include "as10x_handle.h" - #include "endian_mgmt.h" /* FIXME */ -#endif /* __KERNEL__ */ - #include "as10x_types.h" #include "as10x_cmd.h" diff --git a/trunk/drivers/staging/media/as102/as10x_cmd_stream.c b/trunk/drivers/staging/media/as102/as10x_cmd_stream.c index b5e6254ade48..e8c668cff981 100644 --- a/trunk/drivers/staging/media/as102/as10x_cmd_stream.c +++ b/trunk/drivers/staging/media/as102/as10x_cmd_stream.c @@ -16,29 +16,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */ + #include #include "as102_drv.h" -#elif defined(WIN32) - #if defined(DDK) /* win32 ddk implementation */ - #include "wdm.h" - #include "Device.h" - #include "endian_mgmt.h" /* FIXME */ - #else /* win32 sdk implementation */ - #include - #include "types.h" - #include "util.h" - #include "as10x_handle.h" - #include "endian_mgmt.h" - #endif -#else /* all other cases */ - #include - #include "types.h" - #include "util.h" - #include "as10x_handle.h" - #include "endian_mgmt.h" /* FIXME */ -#endif /* __KERNEL__ */ - #include "as10x_cmd.h"