Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2009-11-23 14:01:47 -08:00
parent dcfcb256cc 45ba564d76
commit b5b5150977
5 changed files with 28 additions and 20 deletions
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@ -1189,6 +1189,7 @@ static long rfkill_fop_ioctl(struct file *file, unsigned int cmd,
 #endif

 static const struct file_operations rfkill_fops = {
+	.owner		= THIS_MODULE,
 	.open		= rfkill_fop_open,
 	.read		= rfkill_fop_read,
 	.write		= rfkill_fop_write,