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/parisc/math-emu/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/parisc/math-emu/Makefile')
| -rw-r--r-- | arch/parisc/math-emu/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/math-emu/Makefile b/arch/parisc/math-emu/Makefile index 1f3f225897f5..0bd63b08a79a 100644 --- a/arch/parisc/math-emu/Makefile +++ b/arch/parisc/math-emu/Makefile | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | # See arch/parisc/math-emu/README | 5 | # See arch/parisc/math-emu/README |
| 6 | EXTRA_CFLAGS += -Wno-parentheses -Wno-implicit-function-declaration \ | 6 | ccflags-y := -Wno-parentheses -Wno-implicit-function-declaration \ |
| 7 | -Wno-uninitialized -Wno-strict-prototypes -Wno-return-type \ | 7 | -Wno-uninitialized -Wno-strict-prototypes -Wno-return-type \ |
| 8 | -Wno-implicit-int | 8 | -Wno-implicit-int |
| 9 | 9 | ||