diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-06-22 23:43:08 +0200 |
| commit | f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a (patch) | |
| tree | 2b1e7628b5bad58c4b4065b9de30321bd02ff502 /Makefile | |
| parent | b10197dcf2ca1d6afbdf8f131560a3a0a8b9c72d (diff) | |
| parent | 7b7b4260966a5d991b1dabc82c792fbecd77c63a (diff) | |
| download | buildroot-novena-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.tar.gz buildroot-novena-f3050b0b9ed14596d74a1bcb340ff7f5d86e1b1a.zip | |
Merge branch 'linux-cleanup' of git://git.busybox.net/~tpetazzoni/git/buildroot
Conflicts:
target/Makefile.in
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -309,10 +309,6 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) include toolchain/*/*.mk endif -ifeq ($(BR2_PACKAGE_LINUX),y) -TARGETS+=linux26-modules -endif - include package/*/*.mk TARGETS+=target-finalize @@ -323,6 +319,7 @@ endif include boot/common.mk include target/Makefile.in +include linux/linux.mk include fs/common.mk TARGETS+=erase-fakeroots |