diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-19 10:41:55 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-04-08 07:59:28 -0400 |
commit | 174e7796624d2749359c3fdc673c1232b060d7f6 (patch) | |
tree | b72c821e4c7aa32765fe0509d0ccd00c9c2b68d1 /drivers/crypto | |
parent | e5a1f68203e4dab8fdbb4c7d20977e6a5dbc7a49 (diff) |
ARM: ux500: get rid of <mach/[hardware|db8500-regs].h>
This removes <mach/hardware.h> and <mach/db8500-regs.h>
from the Ux500, merging them into the local include
"db8500-regs.h" in mach-ux500. There is some impact
outside the ux500 machine, but most of it is dealt with
in earlier patches.
Contains portions of a clean-up patch from Arnd Bergmann.
Cc: Samuel Ortiz <sameo@linux.intel.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/crypto')
-rw-r--r-- | drivers/crypto/ux500/cryp/cryp.c | 2 | ||||
-rw-r--r-- | drivers/crypto/ux500/cryp/cryp_core.c | 1 | ||||
-rw-r--r-- | drivers/crypto/ux500/hash/hash_core.c | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/drivers/crypto/ux500/cryp/cryp.c b/drivers/crypto/ux500/cryp/cryp.c index e208ceaf81c9..3eafa903ebcd 100644 --- a/drivers/crypto/ux500/cryp/cryp.c +++ b/drivers/crypto/ux500/cryp/cryp.c | |||
@@ -12,8 +12,6 @@ | |||
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
14 | 14 | ||
15 | #include <mach/hardware.h> | ||
16 | |||
17 | #include "cryp_p.h" | 15 | #include "cryp_p.h" |
18 | #include "cryp.h" | 16 | #include "cryp.h" |
19 | 17 | ||
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c index 8bc5fef07e7a..2809b19e3add 100644 --- a/drivers/crypto/ux500/cryp/cryp_core.c +++ b/drivers/crypto/ux500/cryp/cryp_core.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <crypto/scatterwalk.h> | 32 | #include <crypto/scatterwalk.h> |
33 | 33 | ||
34 | #include <linux/platform_data/crypto-ux500.h> | 34 | #include <linux/platform_data/crypto-ux500.h> |
35 | #include <mach/hardware.h> | ||
36 | 35 | ||
37 | #include "cryp_p.h" | 36 | #include "cryp_p.h" |
38 | #include "cryp.h" | 37 | #include "cryp.h" |
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index 632c3339895f..1827e9f1f873 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c | |||
@@ -32,7 +32,6 @@ | |||
32 | #include <crypto/algapi.h> | 32 | #include <crypto/algapi.h> |
33 | 33 | ||
34 | #include <linux/platform_data/crypto-ux500.h> | 34 | #include <linux/platform_data/crypto-ux500.h> |
35 | #include <mach/hardware.h> | ||
36 | 35 | ||
37 | #include "hash_alg.h" | 36 | #include "hash_alg.h" |
38 | 37 | ||