diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 21:47:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 21:47:56 +0300 |
| commit | ea3398a1ae54cd3403f3cc0f6aa498c7452c681a (patch) | |
| tree | 19903cfd3eb11f6cdd84f3b6923e604028178150 /drivers/staging/rtl8712/osdep_service.h | |
| parent | 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 (diff) | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
| download | linux-ea3398a1ae54cd3403f3cc0f6aa498c7452c681a.tar.xz | |
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8712/osdep_service.h')
| -rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 7d62714ff412..36eeb5a1b5a5 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -22,7 +22,6 @@ #include <linux/module.h> #include <linux/sched.h> #include <linux/kref.h> -#include <linux/smp_lock.h> #include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/usb.h> |