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 /drivers/misc/cb710/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 'drivers/misc/cb710/Makefile')
| -rw-r--r-- | drivers/misc/cb710/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/cb710/Makefile b/drivers/misc/cb710/Makefile index 7b80cbf1a609..467c8e9ca3c9 100644 --- a/drivers/misc/cb710/Makefile +++ b/drivers/misc/cb710/Makefile | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | ifeq ($(CONFIG_CB710_DEBUG),y) | 1 | ccflags-$(CONFIG_CB710_DEBUG) := -DDEBUG |
| 2 | EXTRA_CFLAGS += -DDEBUG | ||
| 3 | endif | ||
| 4 | 2 | ||
| 5 | obj-$(CONFIG_CB710_CORE) += cb710.o | 3 | obj-$(CONFIG_CB710_CORE) += cb710.o |
| 6 | 4 | ||