From 32bacdeb21a7015f441e18d859b3a126e18427f6 Mon Sep 17 00:00:00 2001 From: Amarnath Revanna Date: Wed, 27 Oct 2010 08:34:42 +0000 Subject: [PATCH] --- yaml --- r: 218472 b: refs/heads/master c: 1933f0c09438ed8ccfee2281b814d9b26cef336c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/caif/Kconfig | 7 +++++++ trunk/drivers/net/caif/Makefile | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 50e8e7c9a053..997acec703f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57731f4dda7a5d0c82ec3cc9ba91691b826b76e +refs/heads/master: 1933f0c09438ed8ccfee2281b814d9b26cef336c diff --git a/trunk/drivers/net/caif/Kconfig b/trunk/drivers/net/caif/Kconfig index 75bfc3a9d95f..09ed3f42d673 100644 --- a/trunk/drivers/net/caif/Kconfig +++ b/trunk/drivers/net/caif/Kconfig @@ -31,3 +31,10 @@ config CAIF_SPI_SYNC Putting the next command and length in the start of the frame can help to synchronize to the next transfer in case of over or under-runs. This option also needs to be enabled on the modem. + +config CAIF_SHM + tristate "CAIF shared memory protocol driver" + depends on CAIF && U5500_MBOX + default n + ---help--- + The CAIF shared memory protocol driver for the STE UX5500 platform. diff --git a/trunk/drivers/net/caif/Makefile b/trunk/drivers/net/caif/Makefile index 3a11d619452b..b38d987da67d 100644 --- a/trunk/drivers/net/caif/Makefile +++ b/trunk/drivers/net/caif/Makefile @@ -8,3 +8,7 @@ obj-$(CONFIG_CAIF_TTY) += caif_serial.o # SPI slave physical interfaces module cfspi_slave-objs := caif_spi.o caif_spi_slave.o obj-$(CONFIG_CAIF_SPI_SLAVE) += cfspi_slave.o + +# Shared memory +caif_shm-objs := caif_shmcore.o caif_shm_u5500.o +obj-$(CONFIG_CAIF_SHM) += caif_shm.o