mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-02-22 14:02:05 +00:00
Merge branch 'master' of https://github.com/lwfinger/rtl8188eu
Conflicts: include/osdep_service.h
This commit is contained in:
commit
f8e677c4b4
2 changed files with 3 additions and 3 deletions
|
@ -1413,9 +1413,9 @@ __inline static unsigned char _cancel_timer_ex(_timer *ptimer)
|
||||||
|
|
||||||
static __inline void thread_enter(char *name)
|
static __inline void thread_enter(char *name)
|
||||||
{
|
{
|
||||||
#ifdef daemonize
|
#ifdef daemonize
|
||||||
daemonize("%s", name);
|
daemonize("%s", name);
|
||||||
#endif
|
#endif
|
||||||
allow_signal(SIGTERM);
|
allow_signal(SIGTERM);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -311,7 +311,7 @@ void rtw_proc_init_one(struct net_device *dev)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* LINUX_VERSION_CODE > KERNEL_VERSION(3, 8. 0) */
|
#else /* create_proc_entry not defined */
|
||||||
void rtw_proc_init_one(struct net_device *dev)
|
void rtw_proc_init_one(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct proc_dir_entry *dir_dev = NULL;
|
struct proc_dir_entry *dir_dev = NULL;
|
||||||
|
|
Loading…
Add table
Reference in a new issue