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-linus' of git://www.jni.nu/cris
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
sir-dev.h
diff --git
a/drivers/net/irda/sir-dev.h
b/drivers/net/irda/sir-dev.h
index
9fa294a
..
6d5b1e2
100644
(file)
--- a/
drivers/net/irda/sir-dev.h
+++ b/
drivers/net/irda/sir-dev.h
@@
-22,7
+22,7
@@
struct sir_fsm {
struct semaphore sem;
- struct
work_struct
work;
+ struct
delayed_work
work;
unsigned state, substate;
int param;
int result;
@@
-160,7
+160,6
@@
static inline int sirdev_schedule_mode(struct sir_dev *dev, int mode)
struct sir_dev {
struct net_device *netdev;
- struct net_device_stats stats;
struct irlap_cb *irlap;