---

yaml --- r: 218783 b: refs/heads/master c: 8f6fd7f h: refs/heads/master i: 218781: 44d0090 218779: 9ff1d49 218775: 2d29e47 218767: 920e3cf 218751: 24e7af6 v: v3
git-mirror · Sep 22, 2010 · bfc29b9 · bfc29b9
1 parent b4a6f30
commit bfc29b9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 698e4732e7c9cf9f1f3eac2b8cdce8d4fe2b90bd
+refs/heads/master: 8f6fd7f50f7059e5725a36885af52e54b9df96b2
diff --git a/trunk/arch/arm/mach-ux500/devices-db8500.c b/trunk/arch/arm/mach-ux500/devices-db8500.c
@@ -193,7 +193,6 @@ static struct stedma40_platform_data dma40_plat_data = {
 	.memcpy_len = ARRAY_SIZE(dma40_memcpy_event),
 	.memcpy_conf_phy = &dma40_memcpy_conf_phy,
 	.memcpy_conf_log = &dma40_memcpy_conf_log,
-	.llis_per_log = 8,
 	.disabled_channels = {-1},
 };
 

diff --git a/trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h b/trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h
@@ -148,7 +148,6 @@ struct stedma40_chan_cfg {
  * @memcpy_len: length of memcpy
  * @memcpy_conf_phy: default configuration of physical channel memcpy
  * @memcpy_conf_log: default configuration of logical channel memcpy
- * @llis_per_log: number of max linked list items per logical channel
  * @disabled_channels: A vector, ending with -1, that marks physical channels
  * that are for different reasons not available for the driver.
  */
@@ -160,7 +159,6 @@ struct stedma40_platform_data {
 	u32				 memcpy_len;
 	struct stedma40_chan_cfg	*memcpy_conf_phy;
 	struct stedma40_chan_cfg	*memcpy_conf_log;
-	unsigned int			 llis_per_log;
 	int				 disabled_channels[STEDMA40_MAX_PHYS];
 };