---

yaml --- r: 255327 b: refs/heads/master c: 40d6904 h: refs/heads/master i: 255325: 263a83f 255323: bab16ea 255319: da15e3e 255311: a2d296c 255295: 21a91ee v: v3
git-mirror · Jun 2, 2011 · 2b75d66 · 2b75d66
1 parent 2cd2be0
commit 2b75d66
Show file tree

Hide file tree

Showing 5 changed files with 1,378 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a198c142aacf82acad29e1752191bda8b451a0c7
+refs/heads/master: 40d69043fce579378eb185d31445b6ff66abbd93
diff --git a/trunk/drivers/net/caif/Kconfig b/trunk/drivers/net/caif/Kconfig
@@ -38,3 +38,12 @@ config CAIF_SHM
 	default n
 	---help---
 	The CAIF shared memory protocol driver for the STE UX5500 platform.
+
+config CAIF_HSI
+       tristate "CAIF HSI transport driver"
+       depends on CAIF
+       default n
+       ---help---
+       The caif low level driver for CAIF over HSI.
+       Be aware that if you enable this then you also need to
+       enable a low-level HSI driver.
diff --git a/trunk/drivers/net/caif/Makefile b/trunk/drivers/net/caif/Makefile
@@ -10,3 +10,6 @@ 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
+
+# HSI interface
+obj-$(CONFIG_CAIF_HSI) += caif_hsi.o