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://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
apc.c
diff --git
a/arch/sparc/kernel/apc.c
b/arch/sparc/kernel/apc.c
index
b27476c
..
52de4a9
100644
(file)
--- a/
arch/sparc/kernel/apc.c
+++ b/
arch/sparc/kernel/apc.c
@@
-68,7
+68,7
@@
static void apc_swift_idle(void)
#endif
}
#endif
}
-static inline void apc_free(struct
of
_device *op)
+static inline void apc_free(struct
platform
_device *op)
{
of_iounmap(&op->resource[0], regs, resource_size(&op->resource[0]));
}
{
of_iounmap(&op->resource[0], regs, resource_size(&op->resource[0]));
}
@@
-132,11
+132,12
@@
static const struct file_operations apc_fops = {
.unlocked_ioctl = apc_ioctl,
.open = apc_open,
.release = apc_release,
.unlocked_ioctl = apc_ioctl,
.open = apc_open,
.release = apc_release,
+ .llseek = noop_llseek,
};
static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };
};
static struct miscdevice apc_miscdev = { APC_MINOR, APC_DEVNAME, &apc_fops };
-static int __devinit apc_probe(struct
of
_device *op,
+static int __devinit apc_probe(struct
platform
_device *op,
const struct of_device_id *match)
{
int err;
const struct of_device_id *match)
{
int err;
@@
-184,7
+185,7
@@
static struct of_platform_driver apc_driver = {
static int __init apc_init(void)
{
static int __init apc_init(void)
{
- return of_register_
driver(&apc_driver, &of_bus_type
);
+ return of_register_
platform_driver(&apc_driver
);
}
/* This driver is not critical to the boot process
}
/* This driver is not critical to the boot process