git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
[pandora-kernel.git]
/
drivers
/
char
/
hw_random
/
pasemi-rng.c
diff --git
a/drivers/char/hw_random/pasemi-rng.c
b/drivers/char/hw_random/pasemi-rng.c
index
6d50e9b
..
261ba8f
100644
(file)
--- a/
drivers/char/hw_random/pasemi-rng.c
+++ b/
drivers/char/hw_random/pasemi-rng.c
@@
-24,7
+24,7
@@
#include <linux/platform_device.h>
#include <linux/hw_random.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/hw_random.h>
#include <linux/delay.h>
-#include <
asm
/of_platform.h>
+#include <
linux
/of_platform.h>
#include <asm/io.h>
#define SDCRNG_CTL_REG 0x00
#include <asm/io.h>
#define SDCRNG_CTL_REG 0x00
@@
-98,7
+98,7
@@
static int __devinit rng_probe(struct of_device *ofdev,
const struct of_device_id *match)
{
void __iomem *rng_regs;
const struct of_device_id *match)
{
void __iomem *rng_regs;
- struct device_node *rng_np = ofdev->node;
+ struct device_node *rng_np = ofdev->
dev.of_
node;
struct resource res;
int err = 0;
struct resource res;
int err = 0;
@@
-140,8
+140,11
@@
static struct of_device_id rng_match[] = {
};
static struct of_platform_driver rng_driver = {
};
static struct of_platform_driver rng_driver = {
- .name = "pasemi-rng",
- .match_table = rng_match,
+ .driver = {
+ .name = "pasemi-rng",
+ .owner = THIS_MODULE,
+ .of_match_table = rng_match,
+ },
.probe = rng_probe,
.remove = rng_remove,
};
.probe = rng_probe,
.remove = rng_remove,
};