Conflicts:
	include/osdep_service.h
This commit is contained in:
Larry Finger 2013-05-16 15:46:58 -05:00
commit f8e677c4b4
2 changed files with 3 additions and 3 deletions

View file

@ -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);
} }

View file

@ -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;