diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 10:49:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-10 10:49:53 -0700 |
commit | a4d7749be5de4a7261bcbe3c7d96c748792ec455 (patch) | |
tree | 0a38d9a679b063fb17776ba109018a6d66bf97a1 /drivers/staging/rtl8187se/r8180.h | |
parent | 6580cd59f9d11b62ebef5b27662bdc1fdf34eb64 (diff) | |
parent | ca9fc928788a02a0fe975dc3334e6d7ec521b6af (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: comedi: David doesn't want to get comedi patches
Staging: rtl8187se: Fix compilation warnings and procfs directory leak
Staging: rt2870: new device id
Staging: w35und: unregister device from the ieee80211 stack upon ->disconnect()
Diffstat (limited to 'drivers/staging/rtl8187se/r8180.h')
-rw-r--r-- | drivers/staging/rtl8187se/r8180.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/rtl8187se/r8180.h b/drivers/staging/rtl8187se/r8180.h index 12215fc61dd..db446b7e2e0 100644 --- a/drivers/staging/rtl8187se/r8180.h +++ b/drivers/staging/rtl8187se/r8180.h @@ -19,7 +19,7 @@ #define R8180H -#define RTL8180_MODULE_NAME "rtl8180" +#define RTL8180_MODULE_NAME "r8180" #define DMESG(x,a...) printk(KERN_INFO RTL8180_MODULE_NAME ": " x "\n", ## a) #define DMESGW(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": WW:" x "\n", ## a) #define DMESGE(x,a...) printk(KERN_WARNING RTL8180_MODULE_NAME ": EE:" x "\n", ## a) |