[PATCH] Staging: vt665x: fix built-in compiling

From: Alexander Beregalov
Date: Thu Sep 03 2009 - 12:38:26 EST


Fix this build error:
undefined reference to "__this_module"

Signed-off-by: Alexander Beregalov <a.beregalov@xxxxxxxxx>
---
drivers/staging/vt6655/Makefile | 2 +-
drivers/staging/vt6655/device.h | 6 ------
drivers/staging/vt6656/Makefile | 2 +-
drivers/staging/vt6656/device.h | 6 ------
4 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile
index 260c81d..7c7ee6b 100644
--- a/drivers/staging/vt6655/Makefile
+++ b/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-y += device_main.o \
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 54869c9..fa7f0fc 100644
--- a/drivers/staging/vt6655/device.h
+++ b/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/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index 4467bb1..10f7a28 100644
--- a/drivers/staging/vt6656/Makefile
+++ b/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-y += main_usb.o \
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 33df6e5..b02ca2d 100644
--- a/drivers/staging/vt6656/device.h
+++ b/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>
--
1.6.4.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/