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 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
leds
/
leds-lp5523.c
diff --git
a/drivers/leds/leds-lp5523.c
b/drivers/leds/leds-lp5523.c
index
e19fed2
..
5971e30
100644
(file)
--- a/
drivers/leds/leds-lp5523.c
+++ b/
drivers/leds/leds-lp5523.c
@@
-826,7
+826,7
@@
static int __init lp5523_init_engine(struct lp5523_engine *engine, int id)
return 0;
}
return 0;
}
-static int __init lp5523_init_led(struct lp5523_led *led, struct device *dev,
+static int __
dev
init lp5523_init_led(struct lp5523_led *led, struct device *dev,
int chan, struct lp5523_platform_data *pdata)
{
char name[32];
int chan, struct lp5523_platform_data *pdata)
{
char name[32];
@@
-872,7
+872,7
@@
static int __init lp5523_init_led(struct lp5523_led *led, struct device *dev,
static struct i2c_driver lp5523_driver;
static struct i2c_driver lp5523_driver;
-static int lp5523_probe(struct i2c_client *client,
+static int
__devinit
lp5523_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct lp5523_chip *chip;
const struct i2c_device_id *id)
{
struct lp5523_chip *chip;