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 git://git.infradead.org/~dwmw2/hdroneline

Browse Source 
* git://git.infradead.org/~dwmw2/hdroneline:
  [HEADERS] One line per header in Kbuild files to reduce conflicts

Manual (trivial) conflict resolution in include/asm-s390/Kbuild
This commit is contained in:
Linus Torvalds
2006-09-22 12:56:22 -07:00
parent 3e59ddff2b fadcfa33b6
commit e6e5fee142
29 changed files with 722 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mtd/Kbuild
+6 -2
View File
@@ -1,2 +1,6 @@
unifdef-y := mtd-abi.h
header-y := inftl-user.h jffs2-user.h mtd-user.h nftl-user.h
header-y += inftl-user.h
header-y += jffs2-user.h
header-y += mtd-user.h
header-y += nftl-user.h
unifdef-y += mtd-abi.h