diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/block | |
parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/xsysace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index b71888b909a0..2982b3ee9465 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c | |||
@@ -1194,7 +1194,7 @@ static struct platform_driver ace_platform_driver = { | |||
1194 | 1194 | ||
1195 | #if defined(CONFIG_OF) | 1195 | #if defined(CONFIG_OF) |
1196 | static int __devinit | 1196 | static int __devinit |
1197 | ace_of_probe(struct of_device *op, const struct of_device_id *match) | 1197 | ace_of_probe(struct platform_device *op, const struct of_device_id *match) |
1198 | { | 1198 | { |
1199 | struct resource res; | 1199 | struct resource res; |
1200 | resource_size_t physaddr; | 1200 | resource_size_t physaddr; |
@@ -1226,7 +1226,7 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match) | |||
1226 | return ace_alloc(&op->dev, id ? *id : 0, physaddr, irq, bus_width); | 1226 | return ace_alloc(&op->dev, id ? *id : 0, physaddr, irq, bus_width); |
1227 | } | 1227 | } |
1228 | 1228 | ||
1229 | static int __devexit ace_of_remove(struct of_device *op) | 1229 | static int __devexit ace_of_remove(struct platform_device *op) |
1230 | { | 1230 | { |
1231 | ace_free(&op->dev); | 1231 | ace_free(&op->dev); |
1232 | return 0; | 1232 | return 0; |