diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-23 17:01:47 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-23 17:01:47 -0500 |
| commit | b5b5150977cdfb7173f4468ccd30f9b4a981b902 (patch) | |
| tree | 27d477910d630a027c0b447a58ae61b1c57dbca5 /net/rfkill | |
| parent | dcfcb256cc23c4436691b0fe677275306699d6a1 (diff) | |
| parent | 45ba564d765d6165330e9bb14a197bdd348c114d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/rfkill')
| -rw-r--r-- | net/rfkill/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index ba2efb960c60..a001f7c1f711 100644 --- 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, | |||
| 1189 | #endif | 1189 | #endif |
| 1190 | 1190 | ||
| 1191 | static const struct file_operations rfkill_fops = { | 1191 | static const struct file_operations rfkill_fops = { |
| 1192 | .owner = THIS_MODULE, | ||
| 1192 | .open = rfkill_fop_open, | 1193 | .open = rfkill_fop_open, |
| 1193 | .read = rfkill_fop_read, | 1194 | .read = rfkill_fop_read, |
| 1194 | .write = rfkill_fop_write, | 1195 | .write = rfkill_fop_write, |