projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'omap-for-v4.7/fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
freescale
/
fman
/
fman.c
diff --git
a/drivers/net/ethernet/freescale/fman/fman.c
b/drivers/net/ethernet/freescale/fman/fman.c
index bcb9dccada4dcbb898e3660d6dd1cf11ec588423..1de2e1e51c2be6c2259f8d6dca61b92a1338597e 100644
(file)
--- a/
drivers/net/ethernet/freescale/fman/fman.c
+++ b/
drivers/net/ethernet/freescale/fman/fman.c
@@
-615,7
+615,7
@@
struct fman {
struct fman_cfg *cfg;
struct muram_info *muram;
/* cam section in muram */
-
int
cam_offset;
+
unsigned long
cam_offset;
size_t cam_size;
/* Fifo in MURAM */
int fifo_offset;