Skip to content

Commit

Permalink
[media] staging: as102: Remove non-linux headers inclusion
Browse files Browse the repository at this point in the history
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: Piotr Chmura <chmooreck@poczta.onet.pl>
Signed-off-by: Sylwester Nawrocki <snjw23@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Piotr Chmura authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent 315cadc commit f080c2e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 67 deletions.
5 changes: 3 additions & 2 deletions drivers/staging/media/as102/Makefile
Original file line number Diff line number Diff line change
@@ -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
22 changes: 0 additions & 22 deletions drivers/staging/media/as102/as10x_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
22 changes: 0 additions & 22 deletions drivers/staging/media/as102/as10x_cmd_cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
22 changes: 1 addition & 21 deletions drivers/staging/media/as102/as10x_cmd_stream.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down

0 comments on commit f080c2e

Please sign in to comment.