diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 03:21:26 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-05-15 03:21:26 -0400 |
commit | b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 (patch) | |
tree | 518ec8f4bfd316e91bcc30f434edb78529557eba /drivers/char | |
parent | 8a63b1994c500d4825ee73dc71502deffe5b135b (diff) | |
parent | 4bb2d1009f671815870e8f78e826e4f9071392a7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to add prerequisite for ARM ux500 crypto support.
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/hw_random/nomadik-rng.c | 13 | ||||
-rw-r--r-- | drivers/char/hw_random/omap-rng.c | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c index 3d3c1e6703b4..96de0249e595 100644 --- a/drivers/char/hw_random/nomadik-rng.c +++ b/drivers/char/hw_random/nomadik-rng.c | |||
@@ -107,17 +107,6 @@ static struct amba_driver nmk_rng_driver = { | |||
107 | .id_table = nmk_rng_ids, | 107 | .id_table = nmk_rng_ids, |
108 | }; | 108 | }; |
109 | 109 | ||
110 | static int __init nmk_rng_init(void) | 110 | module_amba_driver(nmk_rng_driver); |
111 | { | ||
112 | return amba_driver_register(&nmk_rng_driver); | ||
113 | } | ||
114 | |||
115 | static void __devexit nmk_rng_exit(void) | ||
116 | { | ||
117 | amba_driver_unregister(&nmk_rng_driver); | ||
118 | } | ||
119 | |||
120 | module_init(nmk_rng_init); | ||
121 | module_exit(nmk_rng_exit); | ||
122 | 111 | ||
123 | MODULE_LICENSE("GPL"); | 112 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c index 448ddb59438a..1412565c01af 100644 --- a/drivers/char/hw_random/omap-rng.c +++ b/drivers/char/hw_random/omap-rng.c | |||
@@ -26,6 +26,8 @@ | |||
26 | 26 | ||
27 | #include <asm/io.h> | 27 | #include <asm/io.h> |
28 | 28 | ||
29 | #include <plat/cpu.h> | ||
30 | |||
29 | #define RNG_OUT_REG 0x00 /* Output register */ | 31 | #define RNG_OUT_REG 0x00 /* Output register */ |
30 | #define RNG_STAT_REG 0x04 /* Status register | 32 | #define RNG_STAT_REG 0x04 /* Status register |
31 | [0] = STAT_BUSY */ | 33 | [0] = STAT_BUSY */ |