projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
[linux-2.6-microblaze.git]
/
arch
/
arm
/
common
/
locomo.c
diff --git
a/arch/arm/common/locomo.c
b/arch/arm/common/locomo.c
index
e45f4e4
..
24d21ba
100644
(file)
--- a/
arch/arm/common/locomo.c
+++ b/
arch/arm/common/locomo.c
@@
-834,14
+834,13
@@
static int locomo_bus_probe(struct device *dev)
return ret;
}
return ret;
}
-static
int
locomo_bus_remove(struct device *dev)
+static
void
locomo_bus_remove(struct device *dev)
{
struct locomo_dev *ldev = LOCOMO_DEV(dev);
struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
if (drv->remove)
drv->remove(ldev);
{
struct locomo_dev *ldev = LOCOMO_DEV(dev);
struct locomo_driver *drv = LOCOMO_DRV(dev->driver);
if (drv->remove)
drv->remove(ldev);
- return 0;
}
struct bus_type locomo_bus_type = {
}
struct bus_type locomo_bus_type = {