diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-elektor.c')
-rw-r--r-- | drivers/i2c/busses/i2c-elektor.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index 37e2e82a9c88..485497066ed7 100644 --- a/drivers/i2c/busses/i2c-elektor.c +++ b/drivers/i2c/busses/i2c-elektor.c | |||
@@ -205,7 +205,7 @@ static struct i2c_adapter pcf_isa_ops = { | |||
205 | .name = "i2c-elektor", | 205 | .name = "i2c-elektor", |
206 | }; | 206 | }; |
207 | 207 | ||
208 | static int __devinit elektor_match(struct device *dev, unsigned int id) | 208 | static int elektor_match(struct device *dev, unsigned int id) |
209 | { | 209 | { |
210 | #ifdef __alpha__ | 210 | #ifdef __alpha__ |
211 | /* check to see we have memory mapped PCF8584 connected to the | 211 | /* check to see we have memory mapped PCF8584 connected to the |
@@ -264,7 +264,7 @@ static int __devinit elektor_match(struct device *dev, unsigned int id) | |||
264 | return 1; | 264 | return 1; |
265 | } | 265 | } |
266 | 266 | ||
267 | static int __devinit elektor_probe(struct device *dev, unsigned int id) | 267 | static int elektor_probe(struct device *dev, unsigned int id) |
268 | { | 268 | { |
269 | init_waitqueue_head(&pcf_wait); | 269 | init_waitqueue_head(&pcf_wait); |
270 | if (pcf_isa_init()) | 270 | if (pcf_isa_init()) |
@@ -293,7 +293,7 @@ static int __devinit elektor_probe(struct device *dev, unsigned int id) | |||
293 | return -ENODEV; | 293 | return -ENODEV; |
294 | } | 294 | } |
295 | 295 | ||
296 | static int __devexit elektor_remove(struct device *dev, unsigned int id) | 296 | static int elektor_remove(struct device *dev, unsigned int id) |
297 | { | 297 | { |
298 | i2c_del_adapter(&pcf_isa_ops); | 298 | i2c_del_adapter(&pcf_isa_ops); |
299 | 299 | ||
@@ -316,7 +316,7 @@ static int __devexit elektor_remove(struct device *dev, unsigned int id) | |||
316 | static struct isa_driver i2c_elektor_driver = { | 316 | static struct isa_driver i2c_elektor_driver = { |
317 | .match = elektor_match, | 317 | .match = elektor_match, |
318 | .probe = elektor_probe, | 318 | .probe = elektor_probe, |
319 | .remove = __devexit_p(elektor_remove), | 319 | .remove = elektor_remove, |
320 | .driver = { | 320 | .driver = { |
321 | .owner = THIS_MODULE, | 321 | .owner = THIS_MODULE, |
322 | .name = "i2c-elektor", | 322 | .name = "i2c-elektor", |