diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/xtensa/boot/lib/Makefile | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/xtensa/boot/lib/Makefile')
| -rw-r--r-- | arch/xtensa/boot/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/boot/lib/Makefile b/arch/xtensa/boot/lib/Makefile index d3d2aa2d883a..ad8952e8a07f 100644 --- a/arch/xtensa/boot/lib/Makefile +++ b/arch/xtensa/boot/lib/Makefile | |||
| @@ -6,7 +6,7 @@ zlib := inffast.c inflate.c inftrees.c | |||
| 6 | 6 | ||
| 7 | lib-y += $(zlib:.c=.o) zmem.o | 7 | lib-y += $(zlib:.c=.o) zmem.o |
| 8 | 8 | ||
| 9 | EXTRA_CFLAGS += -Ilib/zlib_inflate | 9 | ccflags-y := -Ilib/zlib_inflate |
| 10 | 10 | ||
| 11 | quiet_cmd_copy_zlib = COPY $@ | 11 | quiet_cmd_copy_zlib = COPY $@ |
| 12 | cmd_copy_zlib = cat $< > $@ | 12 | cmd_copy_zlib = cat $< > $@ |