aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-09-11 14:20:21 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 12:02:33 -0700
commitc07d3c75a76d93f00182af2c6b750a52ea4d9869 (patch)
tree1993569d33809d74dde870d3e60c516aacf2ffe4 /drivers
parent88ff720865fb8f9d18196810ed6a9553e034834f (diff)
Staging: vt665x: rename the module binary
So it doesn't conflict with a mainline kernel driver currently under development. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/vt6655/Makefile4
-rw-r--r--drivers/staging/vt6656/Makefile4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/vt6655/Makefile b/drivers/staging/vt6655/Makefile
index 260c81d1eae..4bc4a764c87 100644
--- a/drivers/staging/vt6655/Makefile
+++ b/drivers/staging/vt6655/Makefile
@@ -2,7 +2,7 @@
EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -D__NO_VERSION__
EXTRA_CFLAGS += -DHOSTAP
-vt6655-y += device_main.o \
+vt6655_stage-y += device_main.o \
card.o \
mac.o \
baseband.o \
@@ -35,4 +35,4 @@ vt6655-y += device_main.o \
vntwifi.o \
IEEE11h.o
-obj-$(CONFIG_VT6655) += vt6655.o
+obj-$(CONFIG_VT6655) += vt6655_stage.o
diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile
index 4467bb1a608..7fd5a55fd46 100644
--- a/drivers/staging/vt6656/Makefile
+++ b/drivers/staging/vt6656/Makefile
@@ -2,7 +2,7 @@
EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DMODULE -DEXPORT_SYMTAB -D__NO_VERSION__
EXTRA_CFLAGS += -DHOSTAP
-vt6656-y += main_usb.o \
+vt6656_stage-y += main_usb.o \
card.o \
mac.o \
baseband.o \
@@ -36,4 +36,4 @@ vt6656-y += main_usb.o \
firmware.o \
int.o
-obj-$(CONFIG_VT6656) += vt6656.o
+obj-$(CONFIG_VT6656) += vt6656_stage.o