xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Manually resolve conflict in include/mtd/Kbuild

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
David Woodhouse
2006-10-01 17:55:53 +01:00
parent 28b79ff966 82965addad
commit 8a84fc15ae
4921 changed files with 311324 additions and 135534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mtd/Kbuild
View File

@@ -1 +1,5 @@
header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h
header-y += inftl-user.h
header-y += jffs2-user.h
header-y += mtd-abi.h
header-y += mtd-user.h
header-y += nftl-user.h