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 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[pandora-kernel.git]
/
drivers
/
net
/
pci-skeleton.c
diff --git
a/drivers/net/pci-skeleton.c
b/drivers/net/pci-skeleton.c
index
627b619
..
1766dc4
100644
(file)
--- a/
drivers/net/pci-skeleton.c
+++ b/
drivers/net/pci-skeleton.c
@@
-1125,7
+1125,7
@@
static int netdrv_open(struct net_device *dev)
init_timer(&tp->timer);
tp->timer.expires = jiffies + 3 * HZ;
tp->timer.data = (unsigned long) dev;
- tp->timer.function =
&
netdrv_timer;
+ tp->timer.function = netdrv_timer;
add_timer(&tp->timer);
DPRINTK("EXIT, returning 0\n");