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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[pandora-kernel.git]
/
drivers
/
net
/
can
/
sja1000
/
sja1000_of_platform.c
diff --git
a/drivers/net/can/sja1000/sja1000_of_platform.c
b/drivers/net/can/sja1000/sja1000_of_platform.c
index
09c3e9d
..
cee6ba2
100644
(file)
--- a/
drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/
drivers/net/can/sja1000/sja1000_of_platform.c
@@
-38,6
+38,7
@@
#include <linux/interrupt.h>
#include <linux/netdevice.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/netdevice.h>
#include <linux/delay.h>
+#include <linux/io.h>
#include <linux/can/dev.h>
#include <linux/of_platform.h>
#include <linux/can/dev.h>
#include <linux/of_platform.h>
@@
-87,8
+88,7
@@
static int __devexit sja1000_ofp_remove(struct platform_device *ofdev)
return 0;
}
return 0;
}
-static int __devinit sja1000_ofp_probe(struct platform_device *ofdev,
- const struct of_device_id *id)
+static int __devinit sja1000_ofp_probe(struct platform_device *ofdev)
{
struct device_node *np = ofdev->dev.of_node;
struct net_device *dev;
{
struct device_node *np = ofdev->dev.of_node;
struct net_device *dev;
@@
-210,7
+210,7
@@
static struct of_device_id __devinitdata sja1000_ofp_table[] = {
};
MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
};
MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
-static struct
of_
platform_driver sja1000_ofp_driver = {
+static struct platform_driver sja1000_ofp_driver = {
.driver = {
.owner = THIS_MODULE,
.name = DRV_NAME,
.driver = {
.owner = THIS_MODULE,
.name = DRV_NAME,
@@
-222,12
+222,12
@@
static struct of_platform_driver sja1000_ofp_driver = {
static int __init sja1000_ofp_init(void)
{
static int __init sja1000_ofp_init(void)
{
- return
of_register_platform_driv
er(&sja1000_ofp_driver);
+ return
platform_driver_regist
er(&sja1000_ofp_driver);
}
module_init(sja1000_ofp_init);
static void __exit sja1000_ofp_exit(void)
{
}
module_init(sja1000_ofp_init);
static void __exit sja1000_ofp_exit(void)
{
- return
of_unregister_platform_driv
er(&sja1000_ofp_driver);
+ return
platform_driver_unregist
er(&sja1000_ofp_driver);
};
module_exit(sja1000_ofp_exit);
};
module_exit(sja1000_ofp_exit);