Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f080c2ef authored by Piotr Chmura's avatar Piotr Chmura Committed by Mauro Carvalho Chehab
Browse files

[media] staging: as102: Remove non-linux headers inclusion 



Remove inclusion of Windows and other not linux related headers.

[snjw23@gmail.com: edited changelog, folded long line in Makefile]
Cc: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarPiotr Chmura <chmooreck@poczta.onet.pl>
Signed-off-by: default avatarSylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 315cadc4

drivers/staging/media/as102/Makefile

+3 −2
Original line number Diff line number Diff line 
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

drivers/staging/media/as102/as10x_cmd.c

+0 −22
Original line number Diff line number Diff line
@@ -18,30 +18,8 @@ 
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */

#include <linux/kernel.h>

#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 <windows.h>

      #include "types.h"

      #include "util.h"

      #include "as10x_handle.h"

      #include "endian_mgmt.h"

   #endif

#else /* all other cases */

   #include <string.h>

   #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"

drivers/staging/media/as102/as10x_cmd_cfg.c

+0 −22
Original line number Diff line number Diff line
@@ -17,30 +17,8 @@ 
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#if defined(LINUX) && defined(__KERNEL__) /* linux kernel implementation */

#include <linux/kernel.h>

#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 <windows.h>

      #include "types.h"

      #include "util.h"

      #include "as10x_handle.h"

      #include "endian_mgmt.h"

   #endif

#else /* all other cases */

   #include <string.h>

   #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"

drivers/staging/media/as102/as10x_cmd_stream.c

+1 −21
Original line number Diff line number Diff line
@@ -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 <linux/kernel.h>

#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 <windows.h>

	#include "types.h"

	#include "util.h"

	#include "as10x_handle.h"

	#include "endian_mgmt.h"

    #endif

#else /* all other cases */

    #include <string.h>

    #include "types.h"

    #include "util.h"

    #include "as10x_handle.h"

    #include "endian_mgmt.h" /* FIXME */

#endif /* __KERNEL__ */



#include "as10x_cmd.h"