diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 12:37:01 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:04 +0200 |
| commit | 89fd7e44dbe754366354cee37395f7fc11cce50e (patch) | |
| tree | 4eb451caf7f2f789ae9e381b48b012d61c6407c5 /Makefile | |
| parent | 064fdcec9f72fa6616dc4d3bcf340705f27e5fe1 (diff) | |
| parent | 7286acab6715691c1262b320e9d22a480804ba49 (diff) | |
| download | barebox-89fd7e44dbe754366354cee37395f7fc11cce50e.tar.gz barebox-89fd7e44dbe754366354cee37395f7fc11cce50e.tar.xz | |
Merge branch 'for-next/marvell'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -970,7 +970,7 @@ CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_kallsyms* common/barebox_default_env* barebox.ldr \ scripts/bareboxenv-target barebox-flash-image \ Doxyfile.version barebox.srec barebox.s5p barebox.ubl \ - barebox.uimage barebox.spi + barebox.uimage barebox.spi barebox.kwb barebox.kwbuart # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 usr/include |