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
of: Remove duplicate fields from of_platform_driver
[pandora-kernel.git]
/
drivers
/
crypto
/
talitos.c
diff --git
a/drivers/crypto/talitos.c
b/drivers/crypto/talitos.c
index
fd529d6
..
7e4e42d
100644
(file)
--- a/
drivers/crypto/talitos.c
+++ b/
drivers/crypto/talitos.c
@@
-37,6
+37,7
@@
#include <linux/io.h>
#include <linux/spinlock.h>
#include <linux/rtnetlink.h>
#include <linux/io.h>
#include <linux/spinlock.h>
#include <linux/rtnetlink.h>
+#include <linux/slab.h>
#include <crypto/algapi.h>
#include <crypto/aes.h>
#include <crypto/algapi.h>
#include <crypto/aes.h>
@@
-1806,7
+1807,7
@@
static int talitos_probe(struct of_device *ofdev,
const struct of_device_id *match)
{
struct device *dev = &ofdev->dev;
const struct of_device_id *match)
{
struct device *dev = &ofdev->dev;
- struct device_node *np = ofdev->node;
+ struct device_node *np = ofdev->
dev.of_
node;
struct talitos_private *priv;
const unsigned int *prop;
int i, err;
struct talitos_private *priv;
const unsigned int *prop;
int i, err;
@@
-1967,8
+1968,11
@@
static const struct of_device_id talitos_match[] = {
MODULE_DEVICE_TABLE(of, talitos_match);
static struct of_platform_driver talitos_driver = {
MODULE_DEVICE_TABLE(of, talitos_match);
static struct of_platform_driver talitos_driver = {
- .name = "talitos",
- .match_table = talitos_match,
+ .driver = {
+ .name = "talitos",
+ .owner = THIS_MODULE,
+ .of_match_table = talitos_match,
+ },
.probe = talitos_probe,
.remove = talitos_remove,
};
.probe = talitos_probe,
.remove = talitos_remove,
};