projects
/
linux-2.6-block.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://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
[linux-2.6-block.git]
/
arch
/
powerpc
/
platforms
/
83xx
/
mcu_mpc8349emitx.c
diff --git
a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index 31053eec5cd0baa341731fca8375ee42edcd260a..463fa91ee5b663034c9859139e8ab6a11d9a921c 100644
(file)
--- a/
arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/
arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@
-141,7
+141,8
@@
static int mcu_gpiochip_add(struct mcu *mcu)
static int mcu_gpiochip_remove(struct mcu *mcu)
{
- return gpiochip_remove(&mcu->gc);
+ gpiochip_remove(&mcu->gc);
+ return 0;
}
static int mcu_probe(struct i2c_client *client, const struct i2c_device_id *id)