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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
isdn
/
i4l
/
isdn_common.c
diff --git
a/drivers/isdn/i4l/isdn_common.c
b/drivers/isdn/i4l/isdn_common.c
index
d4ad699
..
0f3c66d
100644
(file)
--- a/
drivers/isdn/i4l/isdn_common.c
+++ b/
drivers/isdn/i4l/isdn_common.c
@@
-1924,7
+1924,7
@@
isdn_free_channel(int di, int ch, int usage)
if ((di < 0) || (ch < 0)) {
printk(KERN_WARNING "%s: called with invalid drv(%d) or channel(%d)\n",
- __
FUNCTION
__, di, ch);
+ __
func
__, di, ch);
return;
}
for (i = 0; i < ISDN_MAX_CHANNELS; i++)