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 master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
[pandora-kernel.git]
/
drivers
/
parisc
/
lasi.c
diff --git
a/drivers/parisc/lasi.c
b/drivers/parisc/lasi.c
index
cb3d281
..
bee5100
100644
(file)
--- a/
drivers/parisc/lasi.c
+++ b/
drivers/parisc/lasi.c
@@
-193,7
+193,7
@@
lasi_init_chip(struct parisc_device *dev)
dev->irq = gsc_alloc_irq(&gsc_irq);
if (dev->irq < 0) {
printk(KERN_ERR "%s(): cannot get GSC irq\n",
- __
FUNCTION
__);
+ __
func
__);
kfree(lasi);
return -EBUSY;
}