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/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | drivers/net/caif/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/caif/Kconfig b/drivers/net/caif/Kconfig index 75bfc3a9d95f..09ed3f42d673 100644 --- a/drivers/net/caif/Kconfig +++ b/drivers/net/caif/Kconfig | |||
| @@ -31,3 +31,10 @@ config CAIF_SPI_SYNC | |||
| 31 | Putting the next command and length in the start of the frame can | 31 | Putting the next command and length in the start of the frame can |
| 32 | help to synchronize to the next transfer in case of over or under-runs. | 32 | help to synchronize to the next transfer in case of over or under-runs. |
| 33 | This option also needs to be enabled on the modem. | 33 | This option also needs to be enabled on the modem. |
| 34 | |||
| 35 | config CAIF_SHM | ||
| 36 | tristate "CAIF shared memory protocol driver" | ||
| 37 | depends on CAIF && U5500_MBOX | ||
| 38 | default n | ||
| 39 | ---help--- | ||
| 40 | The CAIF shared memory protocol driver for the STE UX5500 platform. | ||