apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-next' into for-linus

Browse Source 
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
This commit is contained in:
Jiri Kosina
2010-03-08 16:55:37 +01:00
parent 25cf84cf37 3e58974027
commit 318ae2edc3
246 changed files with 396 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/w1/w1.c
+2 -2
View File
@@ -986,7 +986,7 @@ int w1_process(void *data)
return 0;
}
static int w1_init(void)
static int __init w1_init(void)
{
int retval;
@@ -1034,7 +1034,7 @@ err_out_exit_init:
return retval;
}
static void w1_fini(void)
static void __exit w1_fini(void)
{
struct w1_master *dev;