diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-06 22:43:03 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-06 22:43:03 -0800 |
commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /drivers/staging/me4000/me4000.c | |
parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
download | linux-stable-9eeda9abd1faf489f3df9a1f557975f4c8650363.tar.gz linux-stable-9eeda9abd1faf489f3df9a1f557975f4c8650363.tar.bz2 linux-stable-9eeda9abd1faf489f3df9a1f557975f4c8650363.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'drivers/staging/me4000/me4000.c')
-rw-r--r-- | drivers/staging/me4000/me4000.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/me4000/me4000.c b/drivers/staging/me4000/me4000.c index 0b33773bb4f6..0394e2709278 100644 --- a/drivers/staging/me4000/me4000.c +++ b/drivers/staging/me4000/me4000.c @@ -39,7 +39,6 @@ #include <asm/uaccess.h> #include <asm/io.h> #include <asm/system.h> -#include <asm/uaccess.h> /* Include-File for the Meilhaus ME-4000 I/O board */ #include "me4000.h" @@ -1633,9 +1632,6 @@ static int me4000_release(struct inode *inode_p, struct file *file_p) free_irq(ext_int_context->irq, ext_int_context); - /* Delete the fasync structure and free memory */ - me4000_ext_int_fasync(0, file_p, 0); - /* Mark as unused */ ext_int_context->in_use = 0; } else { |