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://git.kernel.dk/linux-block
[pandora-kernel.git]
/
drivers
/
net
/
fs_enet
/
mac-fcc.c
diff --git
a/drivers/net/fs_enet/mac-fcc.c
b/drivers/net/fs_enet/mac-fcc.c
index
7a84e45
..
7583a95
100644
(file)
--- a/
drivers/net/fs_enet/mac-fcc.c
+++ b/
drivers/net/fs_enet/mac-fcc.c
@@
-105,7
+105,7
@@
static int do_pd_setup(struct fs_enet_private *fep)
goto out_ep;
fep->fcc.mem = (void __iomem *)cpm2_immr;
- fpi->dpram_offset = cpm_dpalloc(128,
8
);
+ fpi->dpram_offset = cpm_dpalloc(128,
32
);
if (IS_ERR_VALUE(fpi->dpram_offset)) {
ret = fpi->dpram_offset;
goto out_fcccp;