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 'master' of git://git.infradead.org/users/dwmw2/solos-2.6
[pandora-kernel.git]
/
drivers
/
atm
/
idt77105.c
diff --git
a/drivers/atm/idt77105.c
b/drivers/atm/idt77105.c
index
325325a
..
84672dc
100644
(file)
--- a/
drivers/atm/idt77105.c
+++ b/
drivers/atm/idt77105.c
@@
-4,7
+4,6
@@
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/sched.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/errno.h>
@@
-358,7
+357,7
@@
static const struct atmphy_ops idt77105_ops = {
};
};
-int
__devinit
idt77105_init(struct atm_dev *dev)
+int idt77105_init(struct atm_dev *dev)
{
dev->phy = &idt77105_ops;
return 0;
{
dev->phy = &idt77105_ops;
return 0;