diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 12:55:53 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 12:55:53 -0400 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /include/mtd/Kbuild | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Manually resolve conflict in include/mtd/Kbuild
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/mtd/Kbuild')
| -rw-r--r-- | include/mtd/Kbuild | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild index f2f210fc1ef2..e0fe92b03a4e 100644 --- a/include/mtd/Kbuild +++ b/include/mtd/Kbuild | |||
| @@ -1 +1,5 @@ | |||
| 1 | header-y := inftl-user.h jffs2-user.h mtd-abi.h mtd-user.h nftl-user.h | 1 | header-y += inftl-user.h |
| 2 | header-y += jffs2-user.h | ||
| 3 | header-y += mtd-abi.h | ||
| 4 | header-y += mtd-user.h | ||
| 5 | header-y += nftl-user.h | ||