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.infradead.org/mtd-2.6
[pandora-kernel.git]
/
drivers
/
char
/
xilinx_hwicap
/
xilinx_hwicap.c
diff --git
a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index
ed8a9ce
..
0ed763c
100644
(file)
--- a/
drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/
drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@
-761,7
+761,7
@@
static struct platform_driver hwicap_platform_driver = {
#if defined(CONFIG_OF)
static int __devinit
#if defined(CONFIG_OF)
static int __devinit
-hwicap_of_probe(struct
of
_device *op, const struct of_device_id *match)
+hwicap_of_probe(struct
platform
_device *op, const struct of_device_id *match)
{
struct resource res;
const unsigned int *id;
{
struct resource res;
const unsigned int *id;
@@
-798,7
+798,7
@@
hwicap_of_probe(struct of_device *op, const struct of_device_id *match)
regs);
}
regs);
}
-static int __devexit hwicap_of_remove(struct
of
_device *op)
+static int __devexit hwicap_of_remove(struct
platform
_device *op)
{
return hwicap_remove(&op->dev);
}
{
return hwicap_remove(&op->dev);
}