From bfc29b9f076d46831a9cb018c33ab16206f8eb3a Mon Sep 17 00:00:00 2001 From: Jonas Aaberg Date: Mon, 9 Aug 2010 12:09:04 +0000 Subject: [PATCH] --- yaml --- r: 218783 b: refs/heads/master c: 8f6fd7f50f7059e5725a36885af52e54b9df96b2 h: refs/heads/master i: 218781: 44d0090f5213c7e202f7dd02bd70f5a80d9f095a 218779: 9ff1d49351dca1857094c0b6f5a71ef8eb34ff6d 218775: 2d29e47aaf3c7631f1676d71df2c99fc6e9fd8e6 218767: 920e3cf882964e33e8bd367bb580cad2adf9b1e4 218751: 24e7af6e5eecef4410fd6514e5bcd861455a5cc1 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/devices-db8500.c | 1 - trunk/arch/arm/plat-nomadik/include/plat/ste_dma40.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 36f34a711137..944cdefd2c12 100644 --- 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 index 9280d2561111..58b3e723b183 100644 --- 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 index 879a6c1ac60f..1620492397ec 100644 --- 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]; };