git.samba.org
/
sfrench
/
cifs-2.6.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://oss.sgi.com:8090/xfs/xfs-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
parisc
/
wax.c
diff --git
a/drivers/parisc/wax.c
b/drivers/parisc/wax.c
index 17dce2adf7fe9656ea328e6b0dd79df5e749e466..813c2c24ab1ef8a1273becb3dbfd2ecabcadaebf 100644
(file)
--- a/
drivers/parisc/wax.c
+++ b/
drivers/parisc/wax.c
@@
-76,7
+76,7
@@
wax_init_chip(struct parisc_device *dev)
struct gsc_irq gsc_irq;
int ret;
- wax = k
m
alloc(sizeof(*wax), GFP_KERNEL);
+ wax = k
z
alloc(sizeof(*wax), GFP_KERNEL);
if (!wax)
return -ENOMEM;