diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-10-01 17:55:53 +0100 |
| commit | 8a84fc15ae5cafcc366dd85cf8e1ab2040679abc (patch) | |
| tree | 5d8dce194c9667fa92e9ec9f545cec867a9a1e0d /usr | |
| parent | 28b79ff9661b22e4c41c0d00d4ab8503e810f13d (diff) | |
| parent | 82965addad66fce61a92c5f03104ea90b0b87124 (diff) | |
| download | lwn-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.tar.gz lwn-8a84fc15ae5cafcc366dd85cf8e1ab2040679abc.zip | |
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 'usr')
| -rw-r--r-- | usr/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/Makefile b/usr/Makefile index 5b31c0b61c76..e338e7bedb29 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -3,6 +3,8 @@ # klibcdirs:; +PHONY += klibcdirs + # Generate builtin.o based on initramfs_data.o obj-y := initramfs_data.o |