diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-18 08:20:16 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 03:55:32 -0500 |
commit | 865fab601b8f910b2c634cf4c9211176f2c71cad (patch) | |
tree | 73d51d49870ac7eb08e379fd492c045562161d79 /drivers | |
parent | 2136683172f49a32b3ed7469f6e5ce20c8f4278b (diff) |
ARM: plat-nomadik: move DMA40 header to <linux/platform_data>
This moves the DMA40 platform data header from <plat/ste_dma40.h>
to <linux/platform_data/dma-ste-dma40.h> where is belongs.
Cc: Dan Williams <djbw@fb.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Ola Lilja <ola.o.lilja@stericsson.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Andreas Westin <andreas.westin@stericsson.com>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/crypto/ux500/cryp/cryp_core.c | 3 | ||||
-rw-r--r-- | drivers/dma/ste_dma40.c | 3 | ||||
-rw-r--r-- | drivers/dma/ste_dma40_ll.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index bc615cc56266..8bc5fef07e7a 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
24 | #include <linux/regulator/consumer.h> | 24 | #include <linux/regulator/consumer.h> |
25 | #include <linux/semaphore.h> | 25 | #include <linux/semaphore.h> |
26 | #include <linux/platform_data/dma-ste-dma40.h> | ||
26 | 27 | ||
27 | #include <crypto/aes.h> | 28 | #include <crypto/aes.h> |
28 | #include <crypto/algapi.h> | 29 | #include <crypto/algapi.h> |
@@ -30,8 +31,6 @@ | |||
30 | #include <crypto/des.h> | 31 | #include <crypto/des.h> |
31 | #include <crypto/scatterwalk.h> | 32 | #include <crypto/scatterwalk.h> |
32 | 33 | ||
33 | #include <plat/ste_dma40.h> | ||
34 | |||
35 | #include <linux/platform_data/crypto-ux500.h> | 34 | #include <linux/platform_data/crypto-ux500.h> |
36 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
37 | 36 | ||
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index ae55091c2272..23c5573e62dd 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c | |||
@@ -19,8 +19,7 @@ | |||
19 | #include <linux/err.h> | 19 | #include <linux/err.h> |
20 | #include <linux/amba/bus.h> | 20 | #include <linux/amba/bus.h> |
21 | #include <linux/regulator/consumer.h> | 21 | #include <linux/regulator/consumer.h> |
22 | 22 | #include <linux/platform_data/dma-ste-dma40.h> | |
23 | #include <plat/ste_dma40.h> | ||
24 | 23 | ||
25 | #include "dmaengine.h" | 24 | #include "dmaengine.h" |
26 | #include "ste_dma40_ll.h" | 25 | #include "ste_dma40_ll.h" |
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c index cad9e1daedff..851ad56e8409 100644 --- a/drivers/dma/ste_dma40_ll.c +++ b/drivers/dma/ste_dma40_ll.c | |||
@@ -6,7 +6,7 @@ | |||
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
9 | #include <plat/ste_dma40.h> | 9 | #include <linux/platform_data/dma-ste-dma40.h> |
10 | 10 | ||
11 | #include "ste_dma40_ll.h" | 11 | #include "ste_dma40_ll.h" |
12 | 12 | ||