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/sparc-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
pmi.c
diff --git
a/arch/powerpc/sysdev/pmi.c
b/arch/powerpc/sysdev/pmi.c
index
2f91b55
..
aaa9159
100644
(file)
--- a/
arch/powerpc/sysdev/pmi.c
+++ b/
arch/powerpc/sysdev/pmi.c
@@
-28,9
+28,9
@@
#include <linux/completion.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
#include <linux/completion.h>
#include <linux/spinlock.h>
#include <linux/workqueue.h>
+#include <linux/of_device.h>
+#include <linux/of_platform.h>
-#include <asm/of_device.h>
-#include <asm/of_platform.h>
#include <asm/io.h>
#include <asm/pmi.h>
#include <asm/prom.h>
#include <asm/io.h>
#include <asm/pmi.h>
#include <asm/prom.h>
@@
-50,7
+50,7
@@
struct pmi_data {
static struct pmi_data *data;
static struct pmi_data *data;
-static i
n
t pmi_irq_handler(int irq, void *dev_id)
+static i
rqreturn_
t pmi_irq_handler(int irq, void *dev_id)
{
u8 type;
int rc;
{
u8 type;
int rc;
@@
-205,10
+205,12
@@
static int pmi_of_remove(struct of_device *dev)
}
static struct of_platform_driver pmi_of_platform_driver = {
}
static struct of_platform_driver pmi_of_platform_driver = {
- .name = "pmi",
.match_table = pmi_match,
.probe = pmi_of_probe,
.match_table = pmi_match,
.probe = pmi_of_probe,
- .remove = pmi_of_remove
+ .remove = pmi_of_remove,
+ .driver = {
+ .name = "pmi",
+ },
};
static int __init pmi_module_init(void)
};
static int __init pmi_module_init(void)