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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
drivers
/
net
/
irda
/
actisys-sir.c
diff --git
a/drivers/net/irda/actisys-sir.c
b/drivers/net/irda/actisys-sir.c
index
736d247
..
50b2141
100644
(file)
--- a/
drivers/net/irda/actisys-sir.c
+++ b/
drivers/net/irda/actisys-sir.c
@@
-165,7
+165,7
@@
static int actisys_change_speed(struct sir_dev *dev, unsigned speed)
int ret = 0;
int i = 0;
- IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __
FUNCTION
__,
+ IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __
func
__,
speed, dev->speed);
/* dongle was already resetted from irda_request state machine,