From 4c2dae4c5f039ee2182aee5d745bb647af34e3a4 Mon Sep 17 00:00:00 2001
From: Alexander Beregalov <a.beregalov@gmail.com>
Date: Thu, 3 Sep 2009 20:38:14 +0400
Subject: [PATCH] --- yaml --- r: 162564 b: refs/heads/master c:
 14386fd10c33b6a6a53901a64832f34f038857cf h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/vt6655/Makefile | 2 +-
 trunk/drivers/staging/vt6655/device.h | 6 ------
 trunk/drivers/staging/vt6656/Makefile | 2 +-
 trunk/drivers/staging/vt6656/device.h | 6 ------
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 113a53a924e3..5bca2477c3c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48118b53c6ba0c48440ba552cd7b82c9a9cf530d
+refs/heads/master: 14386fd10c33b6a6a53901a64832f34f038857cf
diff --git a/trunk/drivers/staging/vt6655/Makefile b/trunk/drivers/staging/vt6655/Makefile
index 4bc4a764c877..931deb109ee8 100644
--- a/trunk/drivers/staging/vt6655/Makefile
+++ b/trunk/drivers/staging/vt6655/Makefile
@@ -1,5 +1,5 @@
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -D__NO_VERSION__
+EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -D__NO_VERSION__
 EXTRA_CFLAGS += -DHOSTAP
 
 vt6655_stage-y +=	device_main.o \
diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h
index 54869c9ce756..fa7f0fcad33b 100644
--- a/trunk/drivers/staging/vt6655/device.h
+++ b/trunk/drivers/staging/vt6655/device.h
@@ -29,13 +29,7 @@
 #ifndef __DEVICE_H__
 #define __DEVICE_H__
 
-#ifdef MODULE
-#ifdef MODVERSIONS
-#include <linux/modversions.h>
-#endif /* MODVERSIONS */
 #include <linux/module.h>
-#endif /* MODULE */
-
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/mm.h>
diff --git a/trunk/drivers/staging/vt6656/Makefile b/trunk/drivers/staging/vt6656/Makefile
index 7fd5a55fd46b..582a3519796d 100644
--- a/trunk/drivers/staging/vt6656/Makefile
+++ b/trunk/drivers/staging/vt6656/Makefile
@@ -1,5 +1,5 @@
 # TODO: all of these should be removed
-EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE  -DEXPORT_SYMTAB -D__NO_VERSION__
+EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__
 EXTRA_CFLAGS += -DHOSTAP
 
 vt6656_stage-y +=	main_usb.o \
diff --git a/trunk/drivers/staging/vt6656/device.h b/trunk/drivers/staging/vt6656/device.h
index 33df6e5400e8..b02ca2d66fee 100644
--- a/trunk/drivers/staging/vt6656/device.h
+++ b/trunk/drivers/staging/vt6656/device.h
@@ -29,13 +29,7 @@
 #ifndef __DEVICE_H__
 #define __DEVICE_H__
 
-#ifdef MODULE
-#ifdef MODVERSIONS
-#include <linux/modversions.h>
-#endif /* MODVERSIONS */
 #include <linux/module.h>
-#endif /* MODULE */
-
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/mm.h>