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/net/caif/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/net/caif/Makefile')
| -rw-r--r-- | drivers/net/caif/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/caif/Makefile b/drivers/net/caif/Makefile index 3a11d619452b..9560b9d624bd 100644 --- a/drivers/net/caif/Makefile +++ b/drivers/net/caif/Makefile | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | ifeq ($(CONFIG_CAIF_DEBUG),y) | 1 | ccflags-$(CONFIG_CAIF_DEBUG) := -DDEBUG |
| 2 | EXTRA_CFLAGS += -DDEBUG | ||
| 3 | endif | ||
| 4 | 2 | ||
| 5 | # Serial interface | 3 | # Serial interface |
| 6 | obj-$(CONFIG_CAIF_TTY) += caif_serial.o | 4 | obj-$(CONFIG_CAIF_TTY) += caif_serial.o |
| @@ -8,3 +6,7 @@ obj-$(CONFIG_CAIF_TTY) += caif_serial.o | |||
| 8 | # SPI slave physical interfaces module | 6 | # SPI slave physical interfaces module |
| 9 | cfspi_slave-objs := caif_spi.o caif_spi_slave.o | 7 | cfspi_slave-objs := caif_spi.o caif_spi_slave.o |
| 10 | obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o | 8 | obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o |
| 9 | |||
| 10 | # Shared memory | ||
| 11 | caif_shm-objs := caif_shmcore.o caif_shm_u5500.o | ||
| 12 | obj-$(CONFIG_CAIF_SHM) += caif_shm.o | ||