Merge 3.5-rc4 into staging-next

[~andy/linux] / drivers / staging / rtl8712 / usb_intf.c

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index 69f616c6964ecd752c23f2f5918d03abee2cd7c9..c758c40e0c85a110815e693d65118e3bc24c4af4 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -41,8 +41,6 @@
 #include "usb_ops.h"
 #include "usb_osintf.h"
 
-#define DRVER  "v7_0.20100831"
-
 static struct usb_interface *pintf;
 
 static int r871xu_drv_init(struct usb_interface *pusb_intf,
@@ -374,7 +372,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
        struct net_device *pnetdev;
        struct usb_device *udev;
 
-       printk(KERN_INFO "r8712u: DriverVersion: %s\n", DRVER);
+       printk(KERN_INFO "r8712u: Staging version\n");
        /* In this probe function, O.S. will provide the usb interface pointer
         * to driver. We have to increase the reference count of the usb device
         * structure by using the usb_get_dev function.